Tom O'Neill f1c8d6e771 am f083ae58: am 95b2299d: Merge "API for location settings injection" into klp-dev ...

* commit 'f083ae58594720a65b35491e6206ef2baff621d3':
  API for location settings injection

2013-08-13 17:34:08 -07:00

..

java

Merge "camera2: Clear up docs for CameraDevice#configureOutputs" into klp-dev

2013-08-14 00:16:42 +00:00

jni

am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev

2013-08-12 18:11:28 -07:00

res

am f083ae58: am 95b2299d: Merge "API for location settings injection" into klp-dev

2013-08-13 17:34:08 -07:00

tests

pause/resume for Animators

2013-08-12 11:51:32 -07:00