| commit | 246daf755a6607db575b5bef13d5cc761d4ebbb0 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Tue Sep 10 18:07:23 2013 -0700 |
| committer | Andrew Hsieh <andrewhsieh@google.com> | Tue Sep 10 18:07:23 2013 -0700 |
| tree | dac4527ebb813b4e8b0714e2a506888952cc5fd1 | |
| parent | 46f00b6167f4c23dd4874abe9377bac85e965b2f [diff] | |
| parent | 2b5d2c55bf8c9ced15cfbebe94f0068351f84171 [diff] |
resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp Change-Id: Icd9d5eff3f9acba042c100f694309f902c9d56cf