| commit | 3b9211608669eb5aafba65d35b4cfbec89755499 | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dtor@google.com> | Thu Oct 08 09:36:47 2015 -0700 |
| committer | Dmitry Torokhov <dtor@google.com> | Thu Oct 08 09:36:47 2015 -0700 |
| tree | 872a17e0271f931720d9dc8158877c0cac2fda1c | |
| parent | 313762d88e7820e689879e08f4a93eac3cf8af99 [diff] | |
| parent | b916390540277219aca6aefef7f452374ff890d5 [diff] |
resolved conflicts for b9163905 to mnc-dr-dev-plus-aosp Change-Id: I83afd79491533b1c7ae2aed50a927db175ba555f