| commit | 62d35b65f236e494520d7ca480e502c79f5f4fe3 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Dec 15 16:27:39 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Mon Dec 15 16:27:39 2014 +0000 |
| tree | 32120d1e7d6750937e23851fcb60a60f8fd06723 | |
| parent | 755005bddf4e476dda9404d0ab3ee007b7ebd554 [diff] | |
| parent | fa893886418a077c94ac7280a756b207fc821583 [diff] |
resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a