| commit | 51e740f802083cc250a2f6228222bcbbcec79887 | [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 | beb81f48d8eacdb9e29e369a911c1195e5c7a76d [diff] | |
| parent | 32d86587f32b5c35f9294ed1d9d27446d638de65 [diff] |
resolved conflicts for 32d86587 to mnc-dr-dev-plus-aosp Change-Id: I381133e7dd93f908bd3d2b42e8af83d954e428af