| commit | e51e37c9da63c237800a4e4f751cd0d61d15f57d | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Fri Aug 15 14:41:48 2014 +0100 |
| committer | Calin Juravle <calin@google.com> | Fri Aug 15 15:12:39 2014 +0100 |
| tree | 8a08b32975f214630536800626d700b3b6ebeba8 | |
| parent | 3076fc1f430cefc2881c82924cb882b071eb98f4 [diff] | |
| parent | d3db28a47fe11e49096078e64f43bb246b519b68 [diff] |
resolved conflicts for merge of d3db28a4 to lmp-dev-plus-aosp Change-Id: Ibc0771343762a8d1bf875c36262d9cda896e4d2b