Andreas Gampe aae42eb261 Merge "Frameworks/base: Fix format string in Camera"

2015-03-17 20:52:21 +00:00

..

java

Merge "Frameworks/base: Fix format string in Camera"

2015-03-17 20:52:21 +00:00

jni

Merge "Change jit properties to be debug properties"

2015-03-17 02:04:34 +00:00

res

Import translations. DO NOT MERGE

2015-02-26 15:54:57 -08:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00