| commit | 4885054b6d496a39236c72ebaf535f1e96b9467e | [log] [tgz] |
|---|---|---|
| author | Mindy Pereira <mindyp@google.com> | Mon Oct 11 10:49:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 11 10:49:27 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | 655ce403cd28f849b24162399b3d060797d2324f [diff] | |
| parent | 4df8ed23492d6f75ae7f3ad6d75e45a506ac1491 [diff] |
am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available. Merge commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a' * commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a': DO NOT MERGE Set the cap at alpha to 80% of the total available.