| commit | 017a46f5dab098d0afb582d997ddca697883624d | [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 | bab5ec90cf3b26ed89a28ff4ff2a327bc0260fff | |
| parent | f21b4cde1865747ed054111944e6b30e38109293 [diff] | |
| parent | 390aceaf530b40702e0b30bd51b5eef793c0ac5a [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.