| commit | 0e7e760651e61dd7a52c58daf0880cb8cfd4bb7c | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Wed Oct 06 17:04:44 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 06 17:04:44 2010 -0700 |
| tree | 908a772fc6badc5e38b1808a802627f01594201f | |
| parent | 9fae8611c75668a845c628fb95138849e22b9915 [diff] | |
| parent | c502f54cca85e3aaeced33880890aa1edbcc3514 [diff] |
Merge "resolved conflicts for merge of bba3b8ef to master"