Gustav Sennton fd222fc2f8 resolve merge conflicts of 6cbf137 to master ...

Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f

2016-06-17 09:38:55 +01:00

..

servicestests

resolve merge conflicts of 6cbf137 to master

2016-06-17 09:38:55 +01:00

shortcutmanagerutils

Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev

2016-06-15 21:44:58 +00:00

Android.mk

…