John Spurlock e8962d4b2f am f847c3b0: Merge "Update resource name for renamed string." into klp-dev ...

* commit 'f847c3b014ab49fae6bbbc9dd7aac199b31467df':
  Update resource name for renamed string.

2013-10-15 12:44:57 -07:00

..

java

Camera2: return CaptureResult.STATISTICS_FACES

2013-10-15 07:46:53 -07:00

jni

Merge "Fix registerListener and flush bugs." into klp-dev

2013-10-11 02:05:53 +00:00

res

am f847c3b0: Merge "Update resource name for renamed string." into klp-dev

2013-10-15 12:44:57 -07:00

tests

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

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