| commit | aba2cf6c3b6261cddc1acdd7a1f056a495b10c7c | [log] [tgz] |
|---|---|---|
| author | Konstantin Lopyrev <klopyrev@google.com> | Tue Aug 10 21:49:04 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 10 21:49:04 2010 -0700 |
| tree | 350f06ee295c61fdb5b3f03049e08141652295bd | |
| parent | 870f16311f4043e37fe445ead2899032870d9bd1 [diff] | |
| parent | 37d09899c16adf029c688ae5c1cb31bfd9384603 [diff] |
Merge "resolved conflicts for merge of f00ee0f7 to master"