Romain Guy 6f4a52a3f7 am 67e9e9df: Manual merge of 40170 (b4a107d826) DO NOT MERGE ...

Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp

* commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e':
  Manual merge of 40170 (b4a107d826) DO NOT MERGE

2010-02-17 21:17:48 -08:00

..

android

am 67e9e9df: Manual merge of 40170 (b4a107d826) DO NOT MERGE

2010-02-17 21:17:48 -08:00

com

Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.

2010-01-29 17:59:33 -08:00

jarjar-rules.txt

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

overview.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00