Zhijun He 0ed25174f9 Merge "Camera2: Update java doc for tone.map.curveRed key"

2014-02-18 19:10:37 +00:00

..

java

Merge "Camera2: Update java doc for tone.map.curveRed key"

2014-02-18 19:10:37 +00:00

jni

Remove call to setIsOpaque (again).

2014-02-17 10:46:39 -05:00

res

Import translations. DO NOT MERGE

2014-02-17 14:02:21 -08:00

tests

am 94b7c749: am 37e6af75: am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."

2014-02-17 18:32:44 +00:00