OSDN Git Service

Merge "Merge commit '6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into...
authorEvan Laird <evanlaird@google.com>
Thu, 22 Jun 2017 13:39:34 +0000 (13:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:39:34 +0000 (13:39 +0000)
am: ca35ed5cb9

Change-Id: I0d695cc7edaeddb7817a19ff6f7e33d55691d7e0


Trivial merge