| commit | 5e3ce3972c5f5245115c1f3ed95efab66150d457 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Fri Apr 15 17:13:44 2011 -0700 |
| committer | Raphael <raphael@google.com> | Fri Apr 15 17:13:44 2011 -0700 |
| tree | b58ca5f8057d8154d6b3b8e0131c2b2c6bf8cf38 | |
| parent | e615e85153ac11b809c124368eb99c42182b327b [diff] | |
| parent | 854354be6931ddcd1c284b4b34caa54ef6ae2cfd [diff] |
resolved conflicts for merge of 854354be to honeycomb-plus-aosp Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f