| commit | 39a416c2678620c246ff71b13ea52dd240c16fef | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Mar 14 11:42:53 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Mon Mar 14 11:42:53 2011 -0700 |
| tree | e72a0c2311305643a179cb3e8c70e16aa2bcad51 | |
| parent | 60bd9bfddfc3bcd3113b0669a78454699c1a9d35 [diff] | |
| parent | 88c1ac140076ac34d15ffae8a18ba433f70d2655 [diff] |
resolved conflicts for merge of 88c1ac14 to honeycomb-plus-aosp Change-Id: If97309a24b0e5f7631600aa732b06e521e25cb39