| commit | 8ed75d86b3fa7c399d6387430eeb9e4b66e735fd | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Wed Oct 26 15:04:41 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 26 15:04:41 2011 +0000 |
| tree | 4e5e7c7320754044c31da72bbd21d41cce48462d | |
| parent | ad921d01ca716e3975f12de1a55b23d5338dd473 [diff] | |
| parent | 565b4ce99a613c2a60b92f6bf8846d120182077a [diff] |
am 565b4ce9: (-s ours) merge ics-mr0 * commit '565b4ce99a613c2a60b92f6bf8846d120182077a':