OSDN Git Service

Merge changes Id4647e54,I66b6edbd into oc-dr1-dev am: bf72631a10
authorCorey Tabaka <eieio@google.com>
Thu, 29 Jun 2017 18:54:08 +0000 (18:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 18:54:08 +0000 (18:54 +0000)
commit1ae4dca5010167fd150d8de39e48c43356c236ba
tree97dbaf66b8b7fcf2fc9b486ea050e13217ad632d
parentbca6c411a1e3e3a413654ec53ab312d44325a0ce
parentf036493fab7a65939b37b6da9da12bebe574978c
Merge changes Id4647e54,I66b6edbd into oc-dr1-dev am: bf72631a10
am: f036493fab

Change-Id: Ie396445c41942ab6bbeaf35c504a3be004d5e473