| commit | fd5892cebd34ba45ac7479c3fd0640813b25cca3 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Tue Feb 14 20:12:11 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 14 20:12:11 2012 -0800 |
| tree | 97892949bbab11c335d287b54113f986b826c13d | |
| parent | a308e0540a2e534d70ce0b6b2f948451e763fe16 [diff] | |
| parent | 2a5bc113b49b79c49281d5f8d8c1421d663d2ee4 [diff] |
am 2a5bc113: DO NOT MERGE * commit '2a5bc113b49b79c49281d5f8d8c1421d663d2ee4': DO NOT MERGE