p2p: Display P2P peer MAC address if device name is empty.

Display MAC address of a P2P peer in an invitation prompt
message on receiving invitation request from the P2P peer
with empty device name.

Change-Id: Icabeb91d666437746eb5a733ec582849eb7295a5
CRs-Fixed: 506109
Show confirmation for deleted screenshot.

Change-Id: I4a36cf06bf252e5e15fe08fbd054dc64a0a507ae
SystemUI: Allow theming battery via theme chooser

Change-Id: Iebea2dab0ed89baa14c0f18a4c8f487cdb8313a6
Forward port Status Bar interface (1/2)

Signal / Clock / Notification Count
Change-Id: Iecd4bb06b95b14888916331f5d36327f3206aeef

Port "Fix display of mobile status bar icon when using airplane mode"
Change-Id: Icb5b33008f97eaefd67bb4e5acd1e38bcf2dcb70

Forward port from cm-10.2, adjusted for 4.4

Change-Id: Iecd4bb06b95b14888916331f5d36327f3206aeef
Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>
Fix multi-user issues.

Change-Id: I44d190f60e87326ab3282c898d94ecc88778f2ab
Merge "SystemUI: Allow theming battery via theme chooser" into cm-11.0
Revert "Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty. This often occurs after an incomplete reboot/shutdown or battery pull."

This reverts commit e290de5ecdd591d1978af1b0e9b3303696c849ed.

Change-Id: I5c30ef4560bed7c83243517ba8868069f2777613
Fix broken XML parsing idiom.

Code that expected a single top level element in an XML file
was doing something like :

while (type != START_TAG) { next(); }

This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.

bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Merge "p2p: Display P2P peer MAC address if device name is empty." into cm-11.0
Merge "Show confirmation for deleted screenshot." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0