| commit | a0c02163d4f4e232457a82327381e0a34443110d | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Fri Aug 07 22:12:22 2015 +0100 |
| committer | Roland Levillain <rpl@google.com> | Fri Aug 07 22:12:22 2015 +0100 |
| tree | cdf654f58f92e2fc7aa4ecb2cc4dae5b5cacd474 | |
| parent | c9ed937a8921e77941271b3e7c75dfeb3a14a53b [diff] | |
| parent | bf3cc9e0384a55c37ed8380beff370c373efbe91 [diff] |
resolved conflicts for merge of bf3cc9e0 to mnc-dev-plus-aosp Change-Id: I6079eac15e82065c437391ea5d7491226925c066