| commit | a64e2ad4da3612586594a19489a2b5d44f3f23a0 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Mar 14 10:28:11 2011 -0700 |
| committer | Nick Pelly <npelly@google.com> | Mon Mar 14 10:28:11 2011 -0700 |
| tree | 1c682135210ff543b511152425bc0406b754780d | |
| parent | 2d24213fca55fece8ce4a69a53abcd45983b0443 [diff] | |
| parent | 38d0d5628d36bb1c2a8353a2b3e1a041e9e84652 [diff] |
resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42