OSDN Git Service

Merge changes from topic 'am-bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus...
authorRuchi Kandoi <kandoiruchi@google.com>
Thu, 6 Jul 2017 23:36:21 +0000 (23:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 23:36:21 +0000 (23:36 +0000)
am: 6c6b69ae90

Change-Id: Icea9ef0606dfcff469b711f853fc23a9cafabab5


Trivial merge