OSDN Git Service

Merge changes Ida15546f,I1b099e23 into oc-dev
authorPhil Burk <philburk@google.com>
Sat, 13 May 2017 01:11:06 +0000 (01:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 May 2017 01:11:06 +0000 (01:11 +0000)
commit8f4b21a004761e8ac066e2e17dfd47d2189402fe
tree5c2a4adf65cc30ea7b0281747dcfb555d81b4948
parent92c34de4b27dd5ac9e20fa0132d382d8c5df531a
parent8467c128d7edfc16a93e2606bbae5188f067d2d5
Merge changes Ida15546f,I1b099e23 into oc-dev
am: 8467c128d7

Change-Id: I8af305fb2f7bdacabe739b9ce6056f3de1a3ae94