Filip Gruszczynski 0fbcc7086f am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev ...

* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
  Burn in protection.

2015-02-25 21:40:38 +00:00

..

java

am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev

2015-02-25 21:40:38 +00:00

jni

am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

2015-02-25 19:13:12 +00:00

res

am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev

2015-02-25 21:40:38 +00:00

tests

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

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