| commit | fcda22b1fe33370922a53d6562aa15366818bd45 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Apr 30 17:53:48 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 30 17:53:51 2015 +0000 |
| tree | ef354c053cc59828d3cd416f1c796b4164a6880b | |
| parent | ef25597acfb15b1f4f501fbdcbafd1b6fa8cc9c6 [diff] | |
| parent | 27c39f1adeaf1a653fb41a5af64ee815b8048dd6 [diff] |
Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev