| commit | dd61f6e14ffac3043ae59e426b12424bd66a9de9 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jul 24 11:33:30 2015 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Fri Jul 24 11:33:30 2015 +0100 |
| tree | 4a057e1e155e6b81c265232655748fe8e24594ed | |
| parent | 5ff0223bd9b1ee8b32f53c7b42126200bbb0e27a [diff] | |
| parent | beb0cff60ec99b721427afe1c94561dcced5daa3 [diff] |
resolved conflicts for merge of beb0cff6 to mnc-dr-dev-plus-aosp Change-Id: Ie112762012deae2f130f8c268ad4efac67648418