Alex Klyubin 5c53fdb893 resolve merge conflicts of febd982 to stage-aosp-master ...

Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937

2016-12-22 10:20:23 -08:00

..

java

resolve merge conflicts of febd982 to stage-aosp-master

2016-12-22 10:20:23 -08: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 "Expose ScanResult#untrusted as a @SystemApi."

2016-12-21 19:56:19 +00:00