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 21:56:10 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:56:10 +0000 (21:56 +0000)
am: ce3fef5c99

Change-Id: I73eb7f86fd59536f8e9674a7406f83a3711b653e


Trivial merge