| commit | b8791479af814d530a3810d0516ef5628958a8d0 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Mon Oct 25 15:23:04 2010 -0700 |
| committer | Gloria Wang <gwang@google.com> | Mon Oct 25 16:11:18 2010 -0700 |
| tree | 512aa5507bf60631597c06e77ff58a2e2d99b76b | |
| parent | 67bb6741965c0b9f3bf6b4caf2647efc564e287e [diff] | |
| parent | 9084631dba8938942ddd8d4cb1e0f9149965ae8e [diff] |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472