| commit | e83a780600eda88d351fda590079265bcc0d1f56 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Fri Sep 27 09:42:15 2013 -0700 |
| committer | Conley Owens <cco3@android.com> | Fri Sep 27 13:13:30 2013 -0700 |
| tree | 647f79488dfb5aceacd6889932d9eedfb0f9cac5 | |
| parent | 9a622f874ceb90431623af140ca9a78eadc96dcb [diff] | |
| parent | f4af911065b1b392085b857b891e5496bc75f478 [diff] |
resolved conflicts for merge of f4af9110 to klp-dev-plus-aosp Change-Id: I9e499e552b758392dd0c7b8d888944c0150dd22a