Eric Fischer 7fbedadb62 Merge "Import translations. DO NOT MERGE"

2012-02-25 19:34:19 -08:00

..

java

Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching"

2012-02-24 19:50:11 -08:00

jni

Merge "remove dependency on android_native{s_priv|buffer}.h"

2012-02-24 19:08:12 -08:00

res

Merge "Import translations. DO NOT MERGE"

2012-02-25 19:34:19 -08:00

tests

am c16d9de7: am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1

2012-02-23 08:34:44 -08:00