| commit | d8c400aea32def135abb4aca8a1a1ffea6759c17 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Sep 08 13:59:49 2015 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Tue Sep 08 13:59:49 2015 +0100 |
| tree | 783b5fc2e126ed2d914f26e579426ebeb398be39 | |
| parent | 7f91e8497a1a5f1d53e4153acaf3e46788a40fea [diff] | |
| parent | f2f771451fc8381f92636e8c7e53fb8bd1840a6c [diff] |
resolved conflicts for 32d86587 to mnc-dr-dev-plus-aosp Change-Id: I381133e7dd93f908bd3d2b42e8af83d954e428af