Elliott Hughes 5043dc2063 am bf8a663c: am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation." ...

* commit 'bf8a663c53454f8b8cd7e07344316981022efa10':
  Improve the Resource.getQuantityString/getQuantityText documentation.

2013-03-08 14:44:40 -08:00

..

java

am bf8a663c: am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."

2013-03-08 14:44:40 -08:00

jni

fix JNI use of incStrong/decStrong

2013-03-06 17:48:20 -08:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

2013-03-07 02:59:20 +00:00

tests

am 4a1bd464: am d0d1be2d: Merge "Explain why the frameworks/base DateUtilsTest isn\'t merged with CTS\' DateUtilsTest."

2013-03-07 15:41:14 -08:00