| commit | 3ae2ae90893d5dbeaf0ce9eb1eee9ea9cf12d245 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Feb 01 11:50:28 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 01 11:50:28 2011 -0800 |
| tree | 957967ca93cd09aaa03a41ad7719f195496065a4 | |
| parent | a58d3c1ce5d3ad2defe952cdb2a3c58164222352 [diff] | |
| parent | 399e99f14bb9203c115334eb69f1e0b60d749056 [diff] |
am 17bf5e3c: DO NOT MERGE * commit '17bf5e3ccfe961e6cc967327ab092cfbd6568ddd': DO NOT MERGE