Geoff Mendal 382d6a9ed2 Merge "Import translations. DO NOT MERGE"

2015-01-07 18:46:15 +00:00

..

java

am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"

2015-01-07 18:44:33 +00:00

jni

Merge "Merge frameworks/base changes from master-skia to master."

2015-01-07 16:13:42 +00:00

res

Import translations. DO NOT MERGE

2015-01-07 10:41:50 -08:00

tests

am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a

2014-12-18 02:42:27 +00:00