OSDN Git Service

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

Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a


Trivial merge