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)
am: 8467c128d7

Change-Id: I8af305fb2f7bdacabe739b9ce6056f3de1a3ae94


Trivial merge