fix READ_SETTINGS/WRITE_SETTINGS to be "dangerous"

(see http://www.fireeye.com/blog/technical/2014/04/occupy_your_icons_silently_on_android.html for an explanation why this is dangerous

Change-Id: I203cf418973b873a87eae24f1b39c8ef397e4e58
Folders: Merge Folders

This allows a folder A's contents to be merged into folder B
when folder A is drag/dropped onto folder B.

Change-Id: I41d62d04b6b4f0932cc68fb6d2a3be111b063d53
Trebuchet : Fix overscroll overlay issue

When overscrolling in the app drawer, certain effect/page combinations
cause the pages to be overlayed.

Reproduction :
- Have 2 pages in the app drawer
- Set scroll effect carousel,rotate up/down
- Overscroll one of the pages and let it settle
- Should see first and second page stacked together

Change-Id: Iaa2b06970e2f5d3dda51ce5bf2259523738f7779
Revert "Trebuchet : Fix overscroll overlay issue"

This reverts commit f29645157ef778f245bc5b4f198c85ce585bb482.

Change-Id: Iad637a25ab51ee60bf7a8b3a040abe7d5b709789
Trebuchet : Only reset overscrolled child

Change-Id: Ief240c7fbbe296673ff4124cd4d463c9ba65f764
Automatic translation import

Change-Id: I7826b798d4ba852af567e895bd4850a7eea599d9
Fix name of default

Change-Id: I562dc2572f1d8fdb69f615d1a7f0f425cc27d698
Merge "fix READ_SETTINGS/WRITE_SETTINGS to be "dangerous"" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0