OSDN Git Service

Merge changes I6ff80178,I03875cf1,I8d210b68
authorJeremy Joslin <jjoslin@google.com>
Thu, 19 Jan 2017 23:05:10 +0000 (23:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 23:05:10 +0000 (23:05 +0000)
commitf5e4912fa26af34e61b9a09553368619144d3a77
tree597264c62b757f000e4c935fd189ff0b2b038cd4
parent820ad03ba8c91cd7647a11edc3df2fe51ec55e0e
parent5d942c1352d72951c2ea2b2dbe67e69b0616b797
Merge changes I6ff80178,I03875cf1,I8d210b68
am: 5d942c1352

Change-Id: I6f56b3fa03de6d848ca92693f43ba80ede33a0f2