Ruben Brunk c61f921b99 am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 automerge: 41af9d5 ...

* commit 'ff475c0ea71ffd5f015cce1462daf373129ca896':
  camera2: Fix legacy scaling factor application.

2015-02-13 01:45:27 +00:00

..

java

am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 automerge: 41af9d5

2015-02-13 01:45:27 +00:00

jni

Merge "Intern strings used in Sensor information."

2015-02-12 20:30:07 +00:00

res

am 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev

2015-02-12 23:31:15 +00:00

tests

am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 20:47:31 +00:00