| commit | a5ce1a6fb0a8a5ac0233ffabef7e67ae44756bc7 | [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 | 1fc1f9f6bba6462ac034cf7b60f905ab53abb186 [diff] | |
| parent | b2205bc721d77fc606eeec78d694c7a6e6f16b3d [diff] |
resolved conflicts for merge of b2205bc7 to mnc-dr-dev-plus-aosp Change-Id: I5e92335814494816607a68325a009c6bd0be4bd0