ashutoshj 8a3f7c0738 Merge "Change the name of the contexthub service." ...

am: fba752e64c

Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f

2016-12-29 01:38:30 +00:00

..

java

Merge "Change the name of the contexthub service."

2016-12-29 01:38:30 +00:00

jni

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

2016-12-22 20:48:17 +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