| commit | ac2bf67a008e61909c1001d5b68f015b0fcb58f0 | [log] [tgz] |
|---|---|---|
| author | Jesse Wilson <jessewilson@google.com> | Thu Sep 16 18:22:58 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 16 18:22:59 2010 -0700 |
| tree | 8bd77025e9ddd22fb922c7a87b34985a60c43ce0 | |
| parent | e61174128842791faa38095e9ddf8187d9bd80b6 [diff] | |
| parent | 931928b25698f8dec01cd9ab2a1b49ab669652b8 [diff] |
Merge "resolved conflicts for merge of d78f338e to master"