John Spurlock f1832e2444 am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev ...

* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
  Zen: Improve zen mode panel condition selection.

2014-12-01 19:46:50 +00:00

..

java

am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev

2014-12-01 19:46:50 +00:00

jni

am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev

2014-11-27 00:01:23 +00:00

res

am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev

2014-12-01 19:32:12 +00:00

tests

am 3e5223fd: am 6829daa4: Merge "Add tests about annotations and enum."

2014-12-01 10:12:09 +00:00