Andreas Gampe 1938a389e7 am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera" ...

* commit '3814163b6ddc35292f6b25f782ad7a858c703c24':
  Frameworks/base: Fix format string in Camera

2015-03-17 21:12:25 +00:00

..

java

am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"

2015-03-17 21:12:25 +00:00

jni

Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"

2015-03-17 19:11:33 +00:00

res

am 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

2015-03-17 19:06:58 +00:00

tests

Merge "NetworkStats to support VPN accounting."

2015-03-12 22:10:56 +00:00