| commit | 3115a7ad00115bc0847e939237cae0d9a283fac0 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu Jan 15 10:34:25 2015 +0000 |
| committer | Vladimir Marko <vmarko@google.com> | Thu Jan 15 10:34:25 2015 +0000 |
| tree | 110e1602811782a2a94cdb166ed452360a63856a | |
| parent | 8f88a27aab54b56cfdfc99cdde230d1c8a80e6e4 [diff] | |
| parent | 0673ad4c8b00e949065ea06daf74e407cf29c116 [diff] |
resolved conflicts for merge of 0673ad4c to lmp-mr1-dev-plus-aosp