| commit | 0f2966a3cac3cfcd53fe09e8b2b6e60b5c5958f1 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Nov 14 12:59:52 2014 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Fri Nov 14 12:59:52 2014 -0800 |
| tree | 957cda2b623f88451d1166a646091647fee82e13 | |
| parent | 514eefd53c94b3bab67a92bc7bd859a083a918d3 [diff] | |
| parent | bc137cf4a32e94ca60a8f453884bedf95fdd62dd [diff] |
resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp. Change-Id: I9b542a0b1a2ae52c954b6b6995e6836c0c6713d3