Ari Sachter-Zeltzer 61050196dd am a53b8541: Merge "removing unused kg_* assets from fbc" into klp-dev ...

* commit 'a53b854103c06f194a1883275d5cdfd78882a248':
  removing unused kg_* assets from fbc

2013-09-25 17:31:11 -07:00

..

java

am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev

2013-09-25 17:00:05 -07:00

jni

am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev

2013-09-25 16:09:13 -07:00

res

am a53b8541: Merge "removing unused kg_* assets from fbc" into klp-dev

2013-09-25 17:31:11 -07:00

tests

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

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