OSDN Git Service

Merge changes Id4647e54,I66b6edbd into oc-dr1-dev
authorCorey Tabaka <eieio@google.com>
Thu, 29 Jun 2017 18:50:09 +0000 (18:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 18:50:09 +0000 (18:50 +0000)
am: bf72631a10

Change-Id: Ib1f5d7cc4841124c4f5fc1ea543ce3984dc26d16


Trivial merge