| commit | ea5282cf908251c4df19cee7eff63a0662c79c8c | [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 | e2d965f17447ba5f4b0323efd1ad9d9b745f94d6 | |
| parent | 9e187ed8210ddb0418e19109dd43a03928c11f57 [diff] | |
| parent | ecb1d5ded9afee63735dc91cfb08ada2c639d237 [diff] |
Merge "resolved conflicts for merge of f00ee0f7 to master"