| commit | 870f3f923ed9f6ec3a6b6dc3c8f0eb4da906431f | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Aug 30 14:32:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 30 14:32:54 2010 -0700 |
| tree | 29c94c1c2b800b7ca6355eec61842cfa3335cc60 | |
| parent | 55b6511164e38173629029fbdd2be1b604f5a6e0 [diff] | |
| parent | 52a7907f091f2991bb08f36294497f02dc3350d0 [diff] |
am 52a7907f: am 444d2643: (-s ours) do not merge: cherry-picked 4ffc2eb9858fbce8558a52755b4e48a928399cce from master branch Merge commit '52a7907f091f2991bb08f36294497f02dc3350d0' into gingerbread-plus-aosp * commit '52a7907f091f2991bb08f36294497f02dc3350d0': do not merge: cherry-picked 4ffc2eb9858fbce8558a52755b4e48a928399cce from master branch