| commit | eb6ed4b4fd8d6d4acf8269a673f002f1b59f86ba | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon Aug 17 10:59:02 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 10:59:02 2009 -0700 |
| tree | 526feee0f9d007ca05f9ac1f6568e9a5458fe345 | |
| parent | 621d0beb967facef8b47f9210a9ff61c90b64af8 [diff] | |
| parent | 06952d9299c23ee15df0825e75934971cfecf2ba [diff] |
am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master: Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba' * commit '06952d9299c23ee15df0825e75934971cfecf2ba': DO NOT MERGE - cherry-picked from master: