| commit | 03cf7f79dcd9900e4178144e440c334ff45b14e3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 30 09:27:35 2014 -0700 |
| committer | Geoff Mendal <mendal@google.com> | Wed Jul 30 09:27:35 2014 -0700 |
| tree | 0aa9f16ecba591194d6b6141042b5a910d4956f8 | |
| parent | a9d3ed32e9553b97730ba9fafc4741c91dad7a3b [diff] | |
| parent | 166cfe68c3b0212f8e9714a0acd470d488817093 [diff] |
resolved conflicts for merge of 166cfe68 to lmp-dev-plus-aosp