Eric Fischer 7183a5b177 Merge "Import translations. DO NOT MERGE"

2012-04-16 13:40:53 -07:00

..

java

Merge "Unhide new SurfaceTexture & TextureView APIs"

2012-04-16 13:21:53 -07:00

jni

Merge "Move TrafficStats iface counters to xt_qtaguid."

2012-04-16 12:11:21 -07:00

res

Import translations. DO NOT MERGE

2012-04-16 13:28:08 -07:00

tests

Better error reporting for PackageManager tests

2012-04-15 12:46:22 -07:00