| commit | 65efcc552110751437e587873b7c6f9e2397ac71 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Jun 14 15:05:46 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 14 15:05:46 2011 -0700 |
| tree | 44dabb1422e0bc1e4576fd5bf9d982cb6b0077cc | |
| parent | 6d99a3937df0d178a2fa2dba208f18c99cec8be1 [diff] | |
| parent | 711516d140390aeec9e3eefb8fdb2681c3454980 [diff] |
Merge "resolved conflicts for merge of 77fc8b80 to master"