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

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

2015-03-17 21:05:48 +00:00

..

java

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

2015-03-17 21:05:48 +00:00

jni

Merge "Change jit properties to be debug properties"

2015-03-17 02:04:34 +00:00

res

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

2015-03-17 18:35:17 +00:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00