OSDN Git Service

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

Change-Id: I3e8c5deed8589c1778a1e09e975d2f8ef038b627


Trivial merge