| commit | 2e8ba1c14793563701449c4ddf58b77ac3c36ea8 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Fri May 13 15:38:45 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 13 15:38:45 2011 -0700 |
| tree | b0903b52cfd6a5b7e2da60cfea3b3f5739c61d60 | |
| parent | 3a534f26d19ab27926dc075db531c1151510ceb7 [diff] | |
| parent | 8ff6cb60e13c368b28780fc62e0c9f79b422f62a [diff] |
am 8ff6cb60: DO NOT MERGE * commit '8ff6cb60e13c368b28780fc62e0c9f79b422f62a': DO NOT MERGE