OSDN Git Service

resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp
authorIvan Podogov <ginkage@google.com>
Tue, 13 Dec 2016 20:31:55 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 20:31:55 +0000 (20:31 +0000)
commitdaed2bd2d53eb80d77716fa9286439dedc880540
tree9522b76feb54b6b9daa8805333de37310667baf8
parent686ec7a62be6cb4a16187dbab18d31712a7bbf79
parent90a198a659e2c57f36d21cfc458e2ba29dafa249
resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp
am: 90a198a659  -s ours

Change-Id: I9139e70e694cf024ce633a03dba7f620bc7fac56