| commit | 0524e97ac333c685b43cd9dbe5a49b28371b8865 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Mon Jun 15 15:44:12 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 15 15:44:14 2015 +0000 |
| tree | 6a3985767858dcaa72a273dcca88508bdf20ab01 | |
| parent | 4b8704c9e1024fa7aba66cce03cde78c7e10ba64 [diff] | |
| parent | 8df6d037be43bdf98af011d0188e06a21b033aab [diff] |
Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev