Nick Pelly 30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge ...

Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885

2011-01-25 16:13:17 -08:00

..

android

resolved conflicts for merge of d64d711d to honeycomb-merge

2011-01-25 16:13:17 -08: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

…