| commit | 65ea572b6a712109be4083044be6c285b622e949 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Sep 01 13:43:04 2015 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Tue Sep 01 13:43:04 2015 -0700 |
| tree | 28a62b5513d27549c069d42271383290e83a9c11 | |
| parent | 7f59df60c68bc06efe84f4b4d9d0f1ae476eeafd [diff] | |
| parent | 6d8d1bbf6dec29e99dec2f0101a53c95ae074129 [diff] |
resolved conflicts for merge of b2205bc7 to mnc-dr-dev-plus-aosp Change-Id: I5e92335814494816607a68325a009c6bd0be4bd0