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:40:54 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 00:40:54 +0000 (00:40 +0000)
am: 2d08201d3b

Change-Id: I7d1032bd9d9dfbc2ba3c9b649b09347a2f87ecd1


Trivial merge