| commit | 222ae987aab180b960aac382926c69458b5a2812 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Tue Dec 07 22:57:04 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 07 22:57:04 2010 -0800 |
| tree | 3162f410a33c201134f0b81f23bb777fb9f13d28 | |
| parent | 0de74e0268ff5031a9e06d571e4bab75cf69550e [diff] | |
| parent | a1aa18fc267a7d2db99b3cbc39907127bcdf6ac6 [diff] |
Merge "resolved conflicts for merge of a0f011ff to master"