OSDN Git Service

Merge changes I17119726,Ia1ae819a into nyc-mr1-dev am: 56fc279b7d am: 7dcbf967fa
authorAndrew Solovay <asolovay@google.com>
Fri, 29 Jul 2016 01:55:56 +0000 (01:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jul 2016 01:55:56 +0000 (01:55 +0000)
am: b952d67008

Change-Id: Icb8ed057290348e4d5de608b1e10ed88003398d2


Trivial merge