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)
commitae8e0149cfd5d6c1aa9b4681d1a4f2f864b2183c
tree917d2b47cadad0818d98da0f89b5d36a9ec225ad
parent794e09de9b525076bc0715da3dca1a15984bb8f6
parent8902bbe4e3d4d291d71d341889dc7fa8a5a181f6
Merge changes I7b5504d0,I10c263dc into oc-dev
am: 8902bbe4e3

Change-Id: I6cabb34e39f60ad2c952cb5f5972d0853c48ee49