Marie Janssen 825d8ff56a resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp ...

am: 07e590a574

Change-Id: I49fd2c3ed7ac5cbdf102ec289235b1fb12bee39a

2016-12-29 23:45:39 +00:00

..

java

resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp

2016-12-29 23:45:39 +00:00

jni

Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166

2016-12-29 09:12:22 +00:00

res

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

2016-12-29 20:00:09 +00:00

tests

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

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