John Spurlock 97a2be8672 am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev ...

automerge: 6f9a717

* commit '6f9a71729f6ba7521ed8461ec8b556a8907743b1':
  Zen: Leave zen=none on manual ringer mode stream volume changes.

2014-12-12 04:04:40 +00:00

..

java/com/android/server

am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev

2014-12-12 04:04:40 +00:00

jni

am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

2014-12-11 21:02:08 +00:00

Android.mk

…