OSDN Git Service

Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
authorRuchi Kandoi <kandoiruchi@google.com>
Thu, 6 Jul 2017 23:13:54 +0000 (23:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 23:13:54 +0000 (23:13 +0000)
am: 3462f03144

Change-Id: Ie95b06cd45924664c7a05e649fc96ac4d0f66745


Trivial merge