OSDN Git Service

Merge changes I9047b298,Id9554d6b into oc-dr1-dev am: e6ffd49479
authorCorey Tabaka <eieio@google.com>
Thu, 29 Jun 2017 18:53:49 +0000 (18:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 18:53:49 +0000 (18:53 +0000)
commitbca6c411a1e3e3a413654ec53ab312d44325a0ce
treee4f7bf5724dec5b281dd9e728b9c4248ae8e5c6c
parentb1e29aff043f9b34322b64cde47510f82ea911a1
parente241cbaa7d3d2242bc539391397b6d7fb792aab0
Merge changes I9047b298,Id9554d6b into oc-dr1-dev am: e6ffd49479
am: e241cbaa7d

Change-Id: I29e56cb95b74097c70ba19cc356472ee06e2fac1