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

am: c052e6c67f

Change-Id: I5b515db7eaeac33a9072e6046f4c5bb948d5aa39

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

..

java

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

2016-12-29 09:27:24 +00: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

Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."

2016-12-29 01:20:48 +00:00

tests

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

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