| commit | d515d6c5c4979d5b4856f926187b834cf6b3cd35 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Oct 02 14:35:25 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Thu Oct 02 14:35:25 2014 +0100 |
| tree | f7baabbfb9ba19fb53d01a2a1a8aa79c30a2ed34 | |
| parent | 991459db7adec0626bfa2d5106f9cc548e007292 [diff] | |
| parent | 3f2caae206b5d44e83d44b6753ac736171fab9cb [diff] |
resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp Change-Id: If9f3110e57131f13c55a87169dbdc2cd8cf74660