| commit | f799fac2437987c9785805912931e6b90f15fa6b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Nov 21 11:22:00 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Fri Nov 21 11:22:00 2014 -0800 |
| tree | f19680bed5b84e489607460bf736a02bc36facd1 | |
| parent | 30ebda58388e7c251e04fe0dfdc30e23010d0a4f [diff] | |
| parent | bc2168c9b09f1d919e6419f475e3f4f69f3a4d3e [diff] |
resolved conflicts for merge of bc2168c9 to lmp-mr1-dev-plus-aosp Change-Id: Ic53ce9bdb658838368b4e9029a1f7a4137dd0499