Mathieu Chartier 5ec7c78d52 am 008ec61e: Merge "Change jit properties to be debug properties" ...

* commit '008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
  Change jit properties to be debug properties

2015-03-17 14:36:50 +00:00

..

java

am 345a8f69: Merge "Frameworks/base: Fix a comparison"

2015-03-17 00:25:04 +00:00

jni

Merge "Change jit properties to be debug properties"

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

res

am a98c21a6: Make circular mask thickness configurable

2015-03-11 17:24:54 +00:00

tests

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

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