Elliott Hughes 6c8cd01ad5 am c22657f8: am 3f5778c8: Merge "Fix incorrect FloatMath documentation." ...

* commit 'c22657f8b1e3b9198f1e7795a06a6f59b5cd9c80':
  Fix incorrect FloatMath documentation.

2013-02-26 18:04:35 +00:00

..

java

am c22657f8: am 3f5778c8: Merge "Fix incorrect FloatMath documentation."

2013-02-26 18:04:35 +00:00

jni

Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev

2013-02-26 01:36:05 +00:00

res

Merge "Import translations. DO NOT MERGE"

2013-02-22 23:27:47 +00:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00