| commit | e88c120ebf42f5a16565414415fa292f5ef9525b | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 14:58:37 2015 -0800 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 14:58:37 2015 -0800 |
| tree | 67397a71dfdc03078059bc3a3bfc0ac98b9f598b | |
| parent | a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2 [diff] |
resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again The earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2) wasn't the right one. This fixes it. Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98