| commit | 49fd2afb77394e993863e307066c361dfd5012fb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 25 11:18:17 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 25 11:18:17 2015 -0700 |
| tree | b15871da601b32456dff37af153d675d4318135f | |
| parent | 08692cf322d9fd56917719fe28df14139f2482e7 [diff] | |
| parent | 4a9d7d8655063a383360f857e67d7c626cf0bc31 [diff] |
resolved conflicts for merge of ba8fc829 to mnc-dr-dev-plus-aosp Change-Id: I5d51c0eda73c30b1452166fc4f8e9bae8182d475