OSDN Git Service

Merge changes I761c90cd,I0e2dd0af into nyc-dev am: cb4af5774a am: a74871cfd3
authorAdam Seaton <aseaton@google.com>
Wed, 14 Dec 2016 00:34:22 +0000 (00:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 00:34:22 +0000 (00:34 +0000)
am: 32e254e258

Change-Id: I500a9b4b48f78f9ef475cda9520fb832606fe6e6


Trivial merge