OSDN Git Service

Merge changes I6ff2d6f8,I8f60f116
authorAndreas Gampe <agampe@google.com>
Fri, 21 Apr 2017 19:02:10 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 19:02:10 +0000 (19:02 +0000)
commit37c1413ab217e8a85196c39bee85a5d198f21238
tree1a8d6cd6c50fdcb5edc388588e36eb41c78e1324
parent5337d69ccbf8a5aed1fcbfbf9cdc86f98c1dbe88
parent6b8b07521125e7744327d00e64f897b4dd5d1db9
Merge changes I6ff2d6f8,I8f60f116
am: 6b8b075211

Change-Id: Iec665a5733bb2da0a926317e732382f7993489f9