John Spurlock 34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev ...

* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.

2014-12-01 19:47:58 +00:00

..

java

am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev

2014-12-01 19:47:58 +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