| commit | 5e977798d71b6f84f547a954b71241a2a5b3e8e1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Aug 30 14:37:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 30 14:37:03 2010 -0700 |
| tree | 8f836a50cf88866f97297ea8ca3c5e6dfc4089d2 | |
| parent | f80ae18c7306db334ffbd89c44917084f4b4fe0a [diff] | |
| parent | 870f3f923ed9f6ec3a6b6dc3c8f0eb4da906431f [diff] |
am 870f3f92: (-s ours) am 52a7907f: am 444d2643: (-s ours) do not merge: cherry-picked 4ffc2eb9858fbce8558a52755b4e48a928399cce from master branch Merge commit '870f3f923ed9f6ec3a6b6dc3c8f0eb4da906431f' * commit '870f3f923ed9f6ec3a6b6dc3c8f0eb4da906431f': do not merge: cherry-picked 4ffc2eb9858fbce8558a52755b4e48a928399cce from master branch