OSDN Git Service

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

Change-Id: Ic4d03b483b5ce60e2d917bd645468a45817389c3


Trivial merge