John Spurlock 01a8d29e27 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev ...

automerge: 09ab7d0

* commit '09ab7d0663210f7b87c830b4560474a05564c37a':
  Audio policy: Fix deprecated shouldVibrate api.

2014-12-17 20:27:39 +00:00

..

java/android

am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev

2014-12-17 20:27:39 +00:00

jni

Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest""

2014-12-12 19:35:50 +00:00

lib

…

mca

Cleanup Obsolete LOCAL_PRELINK_MODULE.

2014-12-16 12:45:49 -08:00

tests

resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp

2014-11-21 09:57:52 -08:00