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:15:50 +0000 (00:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 00:15:50 +0000 (00:15 +0000)
am: 533c1efbc7

Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33


Trivial merge