Justin Harrison 04e8a5fb4c am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev ...

* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
  Add UUID for Pbap client

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

..

java

am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev

2014-12-09 00:18:35 +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