OSDN Git Service

am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev
authorSungsoo Lim <sungsoo@google.com>
Mon, 5 Jan 2015 04:39:27 +0000 (04:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Jan 2015 04:39:27 +0000 (04:39 +0000)
automerge: 64a5234  -s ours

* commit '64a5234a3a04108e259730cbdbbb03fd70ff24ed':
  DO NOT MERGE Make mute/unmute work


Trivial merge