| commit | 561ad8c1a4fd519a6ae632ea1d414f90e62da95f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Feb 03 14:31:35 2015 -0800 |
| committer | Elliott Hughes <enh@google.com> | Tue Feb 03 14:31:35 2015 -0800 |
| tree | 7c799c2ced07f7a13622ba93800ff7e92a056052 | |
| parent | 69766c22edb99338c3b703aeadbaa286f6b78334 [diff] | |
| parent | c9692899c936d2d45f9c52f94b9847bd9de86bae [diff] |
resolved conflicts for merge of c9692899 to lmp-mr1-dev-plus-aosp Change-Id: I8f4c9ae0d13d30e69b7a197eafdfcb9b2b9050c0