Sundeep Ghuman 41577a0029 Merge "Cherrypick: Define the calculateRankingScore method and Key." ...

am: 425af45d02

Change-Id: Ib61f91087967f1b026cd2ba77175ccf47943bc53

2016-12-22 19:04:22 +00:00

..

java

Merge "Cherrypick: Define the calculateRankingScore method and Key."

2016-12-22 19:04:22 +00:00

jni

Merge "Fix incorrect FIFO cgroup assignment."

2016-12-21 01:57:51 +00:00

res

Merge "Change fillColor for Wi-Fi badges to #FFFFFF."

2016-12-21 01:10:44 +00:00

tests

Merge "Cherrypick: Define the calculateRankingScore method and Key."

2016-12-22 19:04:22 +00:00