| commit | a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 14:46:27 2015 -0800 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 14:46:27 2015 -0800 |
| tree | e5f6633f5e05758f2e1ea584217159b3df366210 | |
| parent | 5760f1535b0bb619c72e8d4478fc65283bd89eb7 [diff] | |
| parent | 8c831b2fc60bf98530684745bdfc57108e694af4 [diff] |
resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb