* frameworks/base/
b2322f1 Merge changes from topic 'signature-spoofing' into n7.1
3a94c12 Settings left drawer: make the view more compact and show more entries per page
60ec777 Fix lag when opening an entry from the Settings left drawer
94a609e Add SettingsDrawerActivity header

* packages/apps/Email/
c0e5d54 Search in folder specified via URI parameter, if possible.

* packages/apps/Jelly/
c9f336c Jelly: Pause WebView along with the activity
c23c013 Jelly: Don't claim to be a simple WebView
c218521 Jelly: Define base class for Activities containing WebViewExt
1607c0d Jelly: Make it easier to initiate gestures
978e74e Jelly: Don't leak fileoutputstream if bm is null

* packages/apps/UnifiedEmail/
5462df5 Pass selected folder to message search.