| commit | 36255b45aa88e70d4a2feae64fa29050eae2aafc | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Thu Jul 30 17:55:54 2015 +0100 |
| committer | Roland Levillain <rpl@google.com> | Thu Jul 30 17:55:54 2015 +0100 |
| tree | 6371f85d5f3c1dcb417e33eb8804f33c47ce919b | |
| parent | fd1839eb99d5088c7062d8f66cde5e547f61481c [diff] | |
| parent | 8f96df846403703e14016590b4c0c3af870561d9 [diff] |
resolved conflicts for merge of 8f96df84 to mnc-dev-plus-aosp Change-Id: Ib474b16ad1ddf3e823405df977d8341f9cdd3774