| commit | 42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Mar 30 09:36:19 2011 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Mar 30 09:36:40 2011 -0700 |
| tree | 5e7882c763505d7441d4afbd6b852e21aeeb5131 | |
| parent | f701fd1a962180b75531bea555ff9e60ff2647dc [diff] | |
| parent | 70a1ff0357892e18d0db9f334179f97e1bba4985 [diff] |
resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58