OSDN Git Service

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev
authorAdam Vartanian <flooey@google.com>
Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)
am: fea4158eea

Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f


Trivial merge