| commit | 4068646b01d126483f24e1010cfbc33f4d06beb0 | [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 | dc6b00566431771934a0e1084a316317338b994e | |
| parent | 8df959fe4f871c72239027854998a929afa72bdd [diff] | |
| parent | 557e3dadda7d502fb59f575e70145a6f9d16d9cb [diff] |
Merge "resolved conflicts for merge of 070a19e0 to master"