Jean-Baptiste Queru f4072fcc14 resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp ...

Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8

2010-11-17 16:47:59 -08:00

..

android

resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp

2010-11-17 16:47:59 -08:00

com

am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread

2010-11-10 18:01:21 -08:00

jarjar-rules.txt

…

overview.html

…