| commit | 8f88a27aab54b56cfdfc99cdde230d1c8a80e6e4 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu Jan 15 10:28:31 2015 +0000 |
| committer | Vladimir Marko <vmarko@google.com> | Thu Jan 15 10:28:31 2015 +0000 |
| tree | 110e1602811782a2a94cdb166ed452360a63856a | |
| parent | a2f374733ab641c61b229402ed361d068a829587 [diff] | |
| parent | 68e0205895ca8fa0a6217435eed3500a5458f38b [diff] |
resolved conflicts for merge of 68e02058 to lmp-mr1-dev-plus-aosp