OSDN Git Service

resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp
authorTao Bao <tbao@google.com>
Wed, 26 Oct 2016 23:11:40 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Oct 2016 23:11:40 +0000 (23:11 +0000)
commit1b0b9d779bfdc007794bd6e2e0e76efd7b4fa421
treed309a30de819abfda18ef6b58149f817ea73b4fe
parent4b9273184222d5046c48c807462728c5affac36a
parent4a029de94ac4424347f006010d5d2c03ba1bf485
resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp
am: 4a029de94a

Change-Id: Ia016bf93c4b4ae58dd2d46994daaec003b6701ff