| commit | a03656d884ff06e2e1894ba33cb3cc9afe58cf4e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Nov 27 11:31:06 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Thu Nov 27 11:31:06 2014 -0800 |
| tree | 2f28b6b400435afa0d43ce0e52a99a7945bc39b1 | |
| parent | fafbd329cb1685dc91172230a0671175e80ca8b3 [diff] | |
| parent | 809965cc363dfa2a53bfc5bb2f4d14f7f467add8 [diff] |
resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aosp Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a