| commit | 8f3ff09556b2d0c45eebdf97bd980f3b9f0c7d8f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Feb 04 14:26:40 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 04 14:26:40 2010 -0800 |
| tree | 569f5c1fc582aa41207d05a5030b7bde8f553377 | |
| parent | 7b4030dbe7c814c78a761d221d18eaaacfe1431e [diff] | |
| parent | 2cce6267a0cdcdd3f3f369599e99f9a83bbe4be2 [diff] |
Merge "resolved conflicts for merge of dd24f599 to master"