OSDN Git Service

Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)
am: 9d889600a9

Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f


Trivial merge