Nick Pelly cf1f20e701 am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp ...

* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
  Add operands to mifare classic increment, decrement.

2011-01-25 10:30:11 -08:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

8.xml

…

9.xml

Remove API that snuck into MockPackageManager

2011-01-17 13:13:37 -08:00

10.xml

Remove API that snuck into MockPackageManager

2011-01-17 13:13:37 -08:00

11.xml

Throw Base64DataException instead of IOException

2011-01-24 16:47:56 -08:00

current.xml

am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp

2011-01-25 10:30:11 -08:00