tree ce16e0e65c460aaba4b7994c7d5bf8792b8cffcf
parent 553d47bf91b3aa91f6d0a15319f2d891f859edbb
parent 2eea42f7236054d863d023755883ca4bf84766c3
author Tianjie Xu <xunchang@google.com> 1475174031 +0000
committer android-build-merger <android-build-merger@google.com> 1475174031 +0000

DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 am: 4c53af080d  -s ours
am: 2eea42f723  -s ours

Change-Id: Ie6d9a47705e023565ff9fed8676be0ca63df68a8