Andreas Gampe 0fdfe72088 am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |" ...

* commit 'c8484abbbde02171023f159491ca342186ae095c':
  Frameworks/base: Use || instead of |

2015-03-17 20:47:41 +00:00

..

java

am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |"

2015-03-17 20:47:41 +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