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.
This commit is contained in:
Mindy Pereira
2010-10-11 10:49:27 -07:00
committed by Android Git Automerger

Diff Content Not Available