Give floating flag to previous activities in the stack
When launching stacked activities, only the last one is flagged as floating in sysui when tapping halo.
This causes the system to show the launcher when the first stacked activity is launched (this first intent gets the flag FLAG_ACTIVITY_TASK_ON_HOME
in TaskStackBuilder).
This change makes all the stacked activities get the floating flag if the last one has it.
Brightness Control on Status Bar (1/2)

Added Support to control the current brightness to the Status Bar.
Revert "Brightness Control on Status Bar (1/2)"

This reverts commit e4047aa4129cfd5f74be4eb6f76fa3dc2105712c.
CM Privacy Guard (1/2)

framework: Privacy Guard

 * Introduce a new privacy feature which allows the user to run an
   application with reduced visibility into his or her personal data.
 * Adds a per-application flag and simple API to determine if this flag
   is enabled for the current or calling process.
 * This flag can be used by content providers to decide if they should
   return a limited/empty dataset.

Change-Id: Id7c54d728e63acb2b02a2a9322930b54949f6c5d

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml
	core/res/res/values/symbols.xml

Add missing @hide annotations for Privacy Guard

Change-Id: I6072ed2d3ac05382f9cabbada0c42cea6cbe2422

privacy guard: Use LocationBlacklist for location filtering

 * Google has built a per-package blacklist into the location service.
 * Let's use this to handle Privacy Guard instead of our one-off code
   which has a bunch of edge cases and can leave apps in a weird state.

Change-Id: I2f2ecd0b75ff51b44b1a6035189355d7bd63eaf4

Conflicts:
	core/java/android/provider/Settings.java
Fix build with java 7

Change-Id: I48b2048a0cc82df0007ca897aaa8e369bf2d8723
Halo: unregister settings obeservers

Change-Id: I57ec9b874c332bec8be2b3e3ed2505f6be53b79e
gps: Add support for Qualcomm GPS hardware

 * This ABI is changed, but we aren't using the new features in MR1.
 * Add a little translation for the changed fields and methods.

Change-Id: Ieecc2235b42f64fc69d4651855f4e9edfe7d738d
am: Fix the privacy guard notification

 * The privacy guard notification was not showing everytime. Fix the
   logic and handle it in the right place so it hits both the create and
   resume startup path.

Change-Id: I80c88ffb0fcb4ed3ea64ceb228bb436975278ecc
Camera: add support for cm camera

camera: Add support for sending raw commands

 * Certain camera drivers need magic commands to select special modes
   such as ZSL or HDR. Add support for sending raw commands from
   applications.

Change-Id: I512a765c7a67ffd2877e465cf6493ffc2b3b54ac

Camera: add ISO mode support

Change-Id: Ied2075f950269990d836fc768b2c6c36088d494f

Camera: add additional ISO modes (2/2)

Change-Id: I3460c3de4cbef467430673146a9ddb2fdc8f5032

Camera : Powerkey shutter (1/2)

Allows user to take use power key to take pictures/videos

Change-Id: I85a1e1761199f4604672be42a3a5005227f5451a
Revert "Fix build with java 7"

This reverts commit c430247fc2ab4a17ceee929b2b3502a3460e418e.