| commit | 8ff94c73dc44355f1063f56f38f4740ca34a73a5 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Aug 29 15:08:41 2013 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Thu Aug 29 15:08:41 2013 -0700 |
| tree | 32b3a0ce325c1e707dff4ac5938389d97dcf41c6 | |
| parent | 74a180dcb87dfa127680bad59bbaf82710acd430 [diff] | |
| parent | 932cf36899f0f6657f1b0a2c371cd74ed62991c0 [diff] |
resolved conflicts for merge of 932cf368 to klp-dev-plus-aosp Change-Id: I34643fc9fe299c582b29c8ffce19cc177d475abc