Andre Eisenbach 1ee272b064 am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393 ...

* commit 'f60f29d060a538bd59b79ab8bd69ca6a31d26c29':
  Prevent NullPointerException in getStringValue if no value is set

2014-12-10 21:57:40 +00:00

..

java

am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393

2014-12-10 21:57:40 +00:00

jni

am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 21:57:35 +00:00

res

Import translations. DO NOT MERGE

2014-12-10 11:35:51 -08:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00