Steven Moreland 5e1efa2cc7 Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 ...

am: b6022b9fa0

Change-Id: I7135d790ed299f21975c5b27b534714d83ccf440

2016-12-22 20:53:52 +00:00

..

java

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

2016-12-22 19:14:48 +00:00

jni

Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79

2016-12-22 20:53:52 +00:00

res

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

2016-12-21 01:15:18 +00:00

tests

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

2016-12-22 19:14:48 +00:00