OSDN Git Service

Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev
authorLajos Molnar <lajos@google.com>
Mon, 14 Aug 2017 23:39:56 +0000 (23:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Aug 2017 23:39:56 +0000 (23:39 +0000)
am: 1e314546c8

Change-Id: Idd5a40230bbfc2a30a920a1a9b8b58632cdc33fd


Trivial merge