| commit | af420847ed4c2c83984b18daa86cc8485f6db681 | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Thu Jul 30 17:19:09 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 30 17:19:09 2015 +0000 |
| tree | e3f08cd2b6cb186446c11257bec1e0c214936767 | |
| parent | 053c1d86251600af04d29dcb1727631a6847dbf3 [diff] | |
| parent | 36255b45aa88e70d4a2feae64fa29050eae2aafc [diff] |
Merge "resolved conflicts for merge of 8f96df84 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp