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)
commit32e254e258fb3ecd1d7f4c257d4e707839cc8e89
treed8370acdeb644a735abf76853225f2fbd0137544
parentdec80c416e990456bf3aef64d98c4363f4bfa432
parenta74871cfd3a8d720fabc4f839d863d435486f426
Merge changes I761c90cd,I0e2dd0af into nyc-dev am: cb4af5774a
am: a74871cfd3

Change-Id: I3e8c5deed8589c1778a1e09e975d2f8ef038b627