Alan Viverette 8e448aff2d Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev ...

automerge: e5d27a2

* commit 'e5d27a22a6908026d346e86389cf414b5badeab6':
  Play CLICK sound effect when compound buttons are clicked

2014-10-28 01:56:59 +00:00

..

java

Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev

2014-10-28 00:57:11 +00:00

jni

Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev

2014-10-23 21:59:26 +00:00

res

am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev

2014-10-27 20:36:39 +00:00

tests

Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev

2014-10-23 21:06:24 +00:00