| commit | 37cd57772b27bb286aeec915cfaced4fa08508bd | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon May 23 16:59:20 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 23 16:59:20 2011 -0700 |
| tree | 2336b3714cdbbd15a54dd59c10a69dcfee29bdf3 | |
| parent | 560e97f8e0cb63a0fa6e88db6badc142a99517d2 [diff] | |
| parent | 939461300a0283a9f370a0425d4061d32b36f952 [diff] |
Merge "resolved conflicts for merge of 070a19e0 to master"