Jeff Hamilton 4f1b04ac47 resolved conflicts for merge of 0aea1836 to honeycomb-merge ...

Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2

2011-01-25 14:35:55 -06:00

..

android

resolved conflicts for merge of 0aea1836 to honeycomb-merge

2011-01-25 14:35:55 -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

…