Andreas Gampe 93e6d6ede4 am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption" ...

automerge: 555ea65

* commit '555ea653bae019379eb8d1aa70dfcb86789c19d3':
  Core/jni: Disallow relocation for decryption

2015-01-07 22:17:25 +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

am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"

2015-01-07 22:17:25 +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