OSDN Git Service

Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
authorJustin Klaassen <justinklaassen@google.com>
Tue, 26 Jul 2016 15:11:39 +0000 (15:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jul 2016 15:11:39 +0000 (15:11 +0000)
commit3c17a81c5fc89e595d1d97d4a299227b1003e3b8
tree840c995e92a45015b367133e503c045f1de52dcc
parentc78eedc9119a8ce9269f2dbddd402a021809f96e
parente9720671cc48bf9a563ebfa64827916202a8e84b
Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
am: e9720671cc

Change-Id: Ie4210de38ac851d4dfd2ba83cd8db8db890e763f