OSDN Git Service

resolve merge conflicts of 9cbe37e to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Tue, 21 Jun 2016 20:52:32 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 20:52:32 +0000 (20:52 +0000)
commit23fb04f44272a3bae3744a045ad492b3f2d89cbf
treea0ad7e47ea7629f1acb5928d6dd875a4abb12627
parent44a6c25519aa53d8144c2c4f4d96053dfc22d0dd
parent6047c24faea772eabe2eaad96087290f47720c75
resolve merge conflicts of 9cbe37e to nyc-mr1-dev-plus-aosp
am: 6047c24fae

Change-Id: I195bdd7f10ad575107042d26449257ee2a2d7495