Makoto Onuki 312933e043 Merge \"Shortcut: Only \"main\" activities can have shortcuts.\" into nyc-mr1-dev ...

am: 1af9a58956

Change-Id: Id878608aec49985228e129de9736b751c9ae8567

2016-06-24 21:42:54 +00:00

..

java/com/android/server

Merge \"Shortcut: Only \"main\" activities can have shortcuts.\" into nyc-mr1-dev

2016-06-24 21:42:54 +00:00

jni

Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am: 6fb921a61b

2016-05-28 16:41:13 +00:00

Android.mk

Enable boost-locked-region-priority

2016-05-19 08:27:19 +00:00