OSDN Git Service

resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Fri, 24 Jun 2016 05:42:12 +0000 (05:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 05:42:12 +0000 (05:42 +0000)
commita511632dbb9d71bc80fd9f57c0cd13929869be94
treec11f79bf2165e205e7e7437ee95b37694b838b16
parent0291a0a08d33fe2f8d67b88d17b7b72450bd9800
parent707c4ae757322efd04d9dd7b75bd31135b73bcf7
resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp
am: 707c4ae757

Change-Id: I5bce55dbaab58b7c650a0ad743a7ba90ac6160b2