| commit | 39729d08a2141819dfcbaa52d2ef79b117cb14fe | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Thu Aug 26 08:29:10 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 26 08:29:10 2010 -0700 |
| tree | 1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 | |
| parent | 4b1d46ad79584b3c8344f4560e1f1a273b4cb1b2 [diff] | |
| parent | ab9cd1f87587f4f0b80ba7c5da7404bbf2e5e085 [diff] |
Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp