AssetRedirectionManager: Accept redirections only for whitelisted resource types

Change-Id: Idf1ea739a81719b6a196f0114c9fc3b7c7ff428c
SystemUI: Don't try to update the navbar if it doesn't exist

Fix crashes on theme change on devices with buttons

Change-Id: I117c0ae605f7caca7e0f0425b80645a985644630
Add 2G/3G option to profile connections (1/2)

Change-Id: I55d0768c9eeecb7dcce97c6d6390e339d678d0c4
QuickSettings: Camera tile

Change-Id: Id0beb3dd559536bb5571ddc87cb0bcb4945b1a77
Merge "Add 2G/3G option to profile connections (1/2)" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1