Marie Janssen 6727859f42 resolve merge conflicts of 825d8ff to master ...

Change-Id: I57ae47778f738dbea6a670b85f24161cfb544a16

2016-12-29 16:20:43 -08:00

..

java

resolve merge conflicts of 825d8ff to master

2016-12-29 16:20:43 -08:00

jni

Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 am: 010d0be575 am: 1f8c96ca7f

2016-12-29 09:27:24 +00:00

proto/android

Clean up file names for protos

2016-12-20 22:28:56 -08:00

res

Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499 am: 91ab2e2f98

2016-12-29 20:08:38 +00:00

tests

Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 am: 41577a0029

2016-12-22 19:26:05 +00:00