Matthew Xie be96280fda am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev ...

* commit 'a96869fc1323faa5989803c5235c4c28e1094a16':
  Separate the protection of mProxyServiceStateCallbacks from that of mService

2015-02-09 22:22:29 +00:00

..

java

am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev

2015-02-09 22:22:29 +00:00

jni

Add additional info to AudioPort for enum/selection API.

2015-02-04 14:37:19 -08:00

res

Import translations. DO NOT MERGE

2015-02-09 10:08:39 -08:00

tests

Merge "Adapt to change of LOCAL_USE_JACK values"

2015-02-05 11:01:36 +00:00