| commit | 11a3dc18583b6c19b52aa27a8d83136f9d5fc1ef | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Sun Jan 10 18:09:17 2016 -0800 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Sun Jan 10 18:09:17 2016 -0800 |
| tree | 7b59f0e3d325fa5239929ae27118e8812483bb94 | |
| parent | 71f60161c4f84681dc253be76ebca9df319e3ad6 [diff] | |
| parent | bbe98b40cda082024b669fa508931042eed18f82 [diff] |
resolve merge conflicts of bbe98b40cd to mnc-dr2-dev-plus-aosp. Change-Id: I29b420fe9fa3dc7333cffc7de289150387c7ad38
