Dan Stoza f46b85112d am b88a904d: Merge "Allow disabling layer rotation during screenshots" ...

* commit 'b88a904dfe719a8cbb0b9d73cb4637c22a1deed4':
  Allow disabling layer rotation during screenshots

2014-02-19 16:58:22 -08:00

..

java

am b88a904d: Merge "Allow disabling layer rotation during screenshots"

2014-02-19 16:58:22 -08:00

jni

Merge "Allow disabling layer rotation during screenshots"

2014-02-20 00:56:33 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-02-19 22:14:17 +00: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