OSDN Git Service

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

Change-Id: Ia4abd92331ee0d0684d5014f2b33bbc2101935d0


Trivial merge