| commit | b4eac90a09c7cfcb95c43d07fb9241fd46869e10 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Jul 14 10:59:37 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Thu Jul 14 10:59:37 2011 -0700 |
| tree | 775e6da4e664e51ea5da20c01346cab3c403edd9 | |
| parent | 21273a6a9ca8a43cd90521f6d6bb4dc6015b842a [diff] | |
| parent | 3f743e45420e7f6925bc94f7404edea748f99ca3 [diff] |
resolved conflicts for merge of 3f743e45 to gingerbread-plus-aosp Change-Id: I20a6f2ceabe9ee43a141348442c45cb2314a46cf