OSDN Git Service

Merge changes Ida15546f,I1b099e23 into oc-dev am: 8467c128d7
authorPhil Burk <philburk@google.com>
Sat, 13 May 2017 01:18:24 +0000 (01:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 May 2017 01:18:24 +0000 (01:18 +0000)
commit4392ed13542dbcd8dd650b8d09273584fb3979da
tree20e8e51c40efa0d63dce31a9826d432b6eb1ddc6
parentfdd320677ba2ab5c72249946d5192505af1fef7b
parent8f4b21a004761e8ac066e2e17dfd47d2189402fe
Merge changes Ida15546f,I1b099e23 into oc-dev am: 8467c128d7
am: 8f4b21a004

Change-Id: I6d0e7a58fc4f6250b044c79b6f88b438bd011a72