OSDN Git Service

Merge changes I40f055df,I562713df
authorJeremy Joslin <jjoslin@google.com>
Thu, 22 Dec 2016 19:02:45 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 19:02:45 +0000 (19:02 +0000)
am: 4a04c07df4

Change-Id: Ie951518a0a472691d1cd8b90a025e3a67b1acd53


Trivial merge