OSDN Git Service

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +0000)
am: d68bd495ec

Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91


Trivial merge