| commit | 34cbced96ea698ab3a7e9cfc5e8e857ecf9a9897 | [log] [tgz] |
|---|---|---|
| author | Roman Nurik <romannurik@google.com> | Mon Apr 19 16:36:57 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 19 16:36:57 2010 -0700 |
| tree | f738421b276516eff9b40f5a4ccc8b14fbc56799 | |
| parent | 492adf41690fe306ed6cfecd6821fd0d24586c8c [diff] | |
| parent | d1d9f048b1e28472896c482c1f942b8f2143bd9c [diff] |
am d1d9f048: am af232984: cherry-pick from master: 42092024ebd81896e741829c50f37a7e0095392e Merge commit 'd1d9f048b1e28472896c482c1f942b8f2143bd9c' into kraken * commit 'd1d9f048b1e28472896c482c1f942b8f2143bd9c': cherry-pick from master: 42092024ebd81896e741829c50f37a7e0095392e