OSDN Git Service

Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
authorPhilip P. Moltmann <moltmann@google.com>
Tue, 9 May 2017 02:05:24 +0000 (02:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 May 2017 02:05:24 +0000 (02:05 +0000)
am: f512575c68

Change-Id: I590a658c92ad271c7b4f18f5768c1a4e581ffe94


Trivial merge