tree c5d6831e8785942e5a609cb723fc38133cce15e9
parent ffb1952c38d7d39aec6325fd773662ffd731b126
parent 54c6447f47c212006e3b9d0f72a32246b9260399
author Jerry Zhang <zhangjerry@google.com> 1503616206 +0000
committer android-build-merger <android-build-merger@google.com> 1503616206 +0000

Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp
am: 54c6447f47

Change-Id: I13aeac421ecf7a54f16e0fd6aaa19be3f513be4a