| commit | 3f03bb9431e9e73c4d8bdf73e09515667bc5b26c | [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 | dd51ea840b82b9392ec1772b4c49f48f6c6190e1 | |
| parent | cb5456400e7ea672f89209b735b59f2dca2f3c73 [diff] | |
| parent | eb288f6f162beec04b3f227ecfb9f9bb26fb1fa4 [diff] |
am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master: Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba' * commit '06952d9299c23ee15df0825e75934971cfecf2ba': DO NOT MERGE - cherry-picked from master: