| commit | 2697c01c5462e343d43592ee34f5e684267dac22 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 25 11:23:27 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 25 11:23:27 2015 -0700 |
| tree | bdec64808ab1994bdaccc7f802b1b6158295755d | |
| parent | 49fd2afb77394e993863e307066c361dfd5012fb [diff] | |
| parent | 08d94ed83ba4e40cfb41317ff846e0bbbf4aeee2 [diff] |
resolved conflicts for merge of 3ecba7f9 to mnc-dr-dev-plus-aosp Change-Id: Id62f6da9c0194facd91ad77c2ae4c115e68cd8a5