OSDN Git Service

Merge changes I9047b298,Id9554d6b into oc-dr1-dev
authorCorey Tabaka <eieio@google.com>
Thu, 29 Jun 2017 18:49:52 +0000 (18:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 18:49:52 +0000 (18:49 +0000)
commite241cbaa7d3d2242bc539391397b6d7fb792aab0
treeef796a51f68c5d64306a2016be031eb313a197da
parent9579e3cd9478e9c2a46123f305bd4f293a9d147a
parente6ffd494795941d3797c999ff75b7663333b3a80
Merge changes I9047b298,Id9554d6b into oc-dr1-dev
am: e6ffd49479

Change-Id: I8ac6a10b071dd5293dda9347d590b92c9cea0124