| commit | 058ad782e6822ece352bb35d17ef28cc2498b2f5 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu Oct 07 10:57:08 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 07 10:57:08 2010 -0700 |
| tree | 7cc3354dd614a34dbe9dfd97539ca491d240c51f | |
| parent | 7d56e3d3cb5070a20e3c64671132b96dbf9961c5 [diff] | |
| parent | 22f41918fa4d260a4cd2bd432946845b644ecc3a [diff] |
Merge "resolved conflicts for merge of 6327a9fe to master"