OSDN Git Service

Merge changes I7b5504d0,I10c263dc into oc-dev
authorJorim Jaggi <jjaggi@google.com>
Sat, 13 May 2017 13:03:18 +0000 (13:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 May 2017 13:03:18 +0000 (13:03 +0000)
am: 8902bbe4e3

Change-Id: I6cabb34e39f60ad2c952cb5f5972d0853c48ee49


Trivial merge