OSDN Git Service

Merge "Back-port ag/2491664" into lmp-dev
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)
am: 41492a1e2c

Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd


Trivial merge