OSDN Git Service

Merge "resolve merge conflicts of e053d5c to nyc-mr1-dev-plus-aosp" into nyc-mr1...
authorBadhri Jagan Sridharan <badhri@google.com>
Fri, 27 May 2016 18:05:28 +0000 (18:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 18:05:28 +0000 (18:05 +0000)
commit1458cf75221aac01667ec5dbd2de9c2efa45d491
treeb8d0533e53b7236d9e9d744177728e6fe35a6d9a
parentbbcd1931ae00d44b23d931b4daaaf50cc096d3e5
parentf380da37041a0f51d8054cd9b4e31c8dbeca4760
Merge "resolve merge conflicts of e053d5c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp