OSDN Git Service

Merge changes I47ccfa99,I5db1de3e am: 08498c32f4
authorErik Kline <ek@google.com>
Thu, 11 Jan 2018 12:43:38 +0000 (12:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Jan 2018 12:43:38 +0000 (12:43 +0000)
am: 03f3294103

Change-Id: I311f6c299daf1c8d21731187d8e78e55c5767564


Trivial merge