Jeff Hamilton 7ef536ad2e resolved conflicts for merge of 52d3203e to honeycomb-merge ...

Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b

2011-01-26 23:26:16 -06:00

..

android

resolved conflicts for merge of 52d3203e to honeycomb-merge

2011-01-26 23:26:16 -06:00

com

am 3ea5728e: Tweak level at which we reset battery stats to 90%.

2011-01-25 10:45:33 -08:00

jarjar-rules.txt

…

overview.html

…