| commit | deefe553221faf1ac7077a9854a98f5f5c12f248 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Thu Aug 26 15:07:27 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 26 15:07:27 2010 -0700 |
| tree | 61898ff526734b193aedddd430b4a741e7d4f22b | |
| parent | 8a3599614243e31384622fc0806715dab020c4da [diff] | |
| parent | fc2563ba4e9c93ed803f3ce540f92f199f848036 [diff] |
Merge "resolved conflicts for merge of f309c7a8 to master"