Cheuksan Wang 8b3f47b35a am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev ...

* commit '673f443f7e92956399c322b31a14178436fa723b':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE

2014-12-09 00:18:12 +00:00

..

java

am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev

2014-12-09 00:17:44 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev

2014-12-09 00:18:12 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00