Jean-Baptiste Queru 48576911a2 Merge from AOSP staging branch ...

Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd

2012-12-18 15:14:12 -08:00

..

java

Merge from AOSP staging branch

2012-12-18 15:14:12 -08:00

jni

Add return after NULL check in JetPlayer

2012-12-12 05:34:21 +09:00

res

am 0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

2012-12-14 11:55:37 -08:00

tests

am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev

2012-11-15 11:54:43 -08:00