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

* commit 'ec64c0b6e639b743398fb543218100fdaf9a7f69':
  Core/jni: Disallow relocation for decryption

2015-01-07 22:16:11 +00:00

..

java

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

2015-01-07 18:42:57 +00:00

jni

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

2015-01-07 22:16:11 +00:00

res

Import translations. DO NOT MERGE

2015-01-07 07:24:21 -08:00

tests

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

2014-12-18 02:40:10 +00:00