Andreas Gampe b078ff16a3 am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod" ...

* commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
  Frameworks/base: Fix potential NPE in InputMethod

2015-03-18 22:33:28 +00:00

..

java

am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"

2015-03-18 22:33:28 +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