| commit | d5759f1c2c8038d6c8275b1ba7dc93a40763088c | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Jun 12 12:43:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 12:43:26 2012 -0700 |
| tree | 4163615f9bb7dafc87d5262018907acea8fef4b0 | |
| parent | 007f2b40f952eab8951c6b22302a59a955a20561 [diff] | |
| parent | 73220fa083f6b2b302434ad081dd062505744ed8 [diff] |
am 73220fa0: Merge "Merge errors." into jb-dev * commit '73220fa083f6b2b302434ad081dd062505744ed8': Merge errors.