OSDN Git Service

Merge changes I6ff2d6f8,I8f60f116 am: 6b8b075211
authorAndreas Gampe <agampe@google.com>
Fri, 21 Apr 2017 19:06:04 +0000 (19:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 19:06:04 +0000 (19:06 +0000)
commitf7fc407e3ea4e58c4da6909e32c3e6a7a72f14e9
tree1a8d6cd6c50fdcb5edc388588e36eb41c78e1324
parent9693638da44be57976befd2c81e4fddebd8afb30
parent37c1413ab217e8a85196c39bee85a5d198f21238
Merge changes I6ff2d6f8,I8f60f116 am: 6b8b075211
am: 37c1413ab2

Change-Id: I8c69f9afc9d51aa838f0541794962240602913e5