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

* commit '533758c1fb2dcf5b50db46b60d26ecae72fc71ee':
  jni: switch to ANDROID_LOG_* mode flags

2015-02-25 19:19:27 +00:00

..

java

am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev

2015-02-25 18:44:57 +00:00

jni

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

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

res

am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev

2015-02-25 18:44:57 +00:00

tests

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

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