OSDN Git Service

Merge "resolved conflicts for merge of 8f96df84 to mnc-dev-plus-aosp" into mnc-dev...
authorRoland Levillain <rpl@google.com>
Thu, 30 Jul 2015 17:19:09 +0000 (17:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Jul 2015 17:19:09 +0000 (17:19 +0000)
commitaf420847ed4c2c83984b18daa86cc8485f6db681
treee3f08cd2b6cb186446c11257bec1e0c214936767
parent053c1d86251600af04d29dcb1727631a6847dbf3
parent36255b45aa88e70d4a2feae64fa29050eae2aafc
Merge "resolved conflicts for merge of 8f96df84 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp