OSDN Git Service

Merge changes I1b2f0726,Iaed2c7e7 into oc-dev am: 183b476538
authorPhilip P. Moltmann <moltmann@google.com>
Sat, 29 Apr 2017 03:23:14 +0000 (03:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 03:23:14 +0000 (03:23 +0000)
am: 2aa5a05aec

Change-Id: I9468e6a83af193e71543a26dc6bde6a382e2d550


Trivial merge