Mark Salyzyn 533758c1fb am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags" ...

* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags

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

..

java

am 6e208cdd: Merge "Remove wrong javadoc comment"

2015-02-24 10:11:52 +00:00

jni

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

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

res

Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEAD

2015-02-19 14:31:36 -08:00

tests

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

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