OSDN Git Service

resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Fri, 24 Jun 2016 06:18:21 +0000 (06:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 06:18:21 +0000 (06:18 +0000)
commit429a5851d71a07b88726c1931f371b447d2e118f
treec11f79bf2165e205e7e7437ee95b37694b838b16
parentba4c8d998d42a402034ebc54a96ae4965ea82677
parent7df3890039a20573760e1032b5b7c23c0b3a4728
resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp
am: 7df3890039

Change-Id: I4f3dd7b66e0e5807d89cd19542c39dd81ae6ddf3