Eino-Ville Talvala c80477e712 am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev ...

* commit 'a7833f861e303d9dea2cf54ceb519ff937f68367':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals

2013-10-14 23:48:29 -07:00

..

java

am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev

2013-10-14 23:48:29 -07:00

jni

am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

2013-10-14 13:17:20 -07:00

res

am 87408ffd: am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev

2013-10-14 19:00:32 -07:00

tests

Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 21:11:31 +00:00