| commit | b8796212e3544262193960ade01db6cb2023c8f9 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Mar 15 11:54:46 2011 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Tue Mar 15 11:54:46 2011 -0700 |
| tree | 19c0985c9095029ae4fba30d617f263858ed8a38 | |
| parent | d927e2742871dec1cf9a8d861a24d5bcc73c542e [diff] | |
| parent | ceae99835ed909346f23cc604d20a488ac63c6ce [diff] |
resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3