OSDN Git Service

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

Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2


Trivial merge