Reconcile with jb-mr1-release

Change-Id: Idbdd25900489311c1d48c0bd6ef34c8c34c2d1e8
am ddafaadb: Explicitly export content providers

* commit 'ddafaadba3db45071e52391277ca0ac0bf5ce9dd':
  Explicitly export content providers
Reconcile with jb-mr1-release - do not merge

Change-Id: Ia1d2509ec937410d2bf6d6b1f81ddfca57d61567
am 71d93f39: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '71d93f3947eb6145ddb70289da7bf164f769ffb6':
Only set file size if the app didn't

This lets apps specify the eventual file size if it wants to,
while the provider will fill it in with the current file size
if the app didn't specify it.
b/6857704

Change-Id: Ide12957180a5826404821459368abd2de4f6d2ba
Merge "Only set file size if the app didn't"
am 9b1fff74: Fix mediaprovider stats

* commit '9b1fff741d2dc2b5f64727417c1ae74a051f9b02':
  Fix mediaprovider stats
am dcbeb813: am 9b1fff74: Fix mediaprovider stats

* commit 'dcbeb813d0a88159202ad711209e90dfca1f596a':
  Fix mediaprovider stats
Reconcile with jb-mr1-release - do not merge

Change-Id: I317b42faec06d2263a72eca468ba9673f1bd4372
am 20eb840e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '20eb840e930e0fe98e42882148da4547da569139':
am fda8379c: am f1597bc9: (-s ours) Merge "Fixed release of wakelock"

* commit 'fda8379c49cd45ef434d626532dc8d459fbabc5c':
  Fixed release of wakelock
am 3e0551d7: am fda8379c: am f1597bc9: (-s ours) Merge "Fixed release of wakelock"

* commit '3e0551d72e36691b7202ae55a125d667873ff1d7':
  Fixed release of wakelock
am b7fb6600: am 7021e104: Merge "MtpService: check primary storage status when use it in PTP mode"

* commit 'b7fb66005396514e11589cfcef4e3df346a09420':
  MtpService: check primary storage status when use it in PTP mode
am cfb9c213: am b7fb6600: am 7021e104: Merge "MtpService: check primary storage status when use it in PTP mode"

* commit 'cfb9c213d7bbcddae215f85343385adb9631a15d':
  MtpService: check primary storage status when use it in PTP mode
Reconcile with jb-mr1-release - do not merge

Change-Id: Idf52e01ae31e4f8665ff945fc53943906611e62e
am 4a10e73f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4a10e73f5803bbb6258fe2544157bc23bdff1155':
am 4a7bf688: Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)

* commit '4a7bf688505af8daa7e7c3b4889520cf79a26a57':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
am 395ad259: Include user identifier in external storage paths.

* commit '395ad2597601ccf285cfe679c7263a1b1feee231':
  Include user identifier in external storage paths.
Reconcile with jb-mr1-release - do not merge

Change-Id: I561bcbb1b33f19d08e9c9b316e132f4314116e5f
am 57b65f10: Leave trigger intact during upgrade.

* commit '57b65f10aaafc4bf42a0fa59eb2bbe6c8371c2e6':
  Leave trigger intact during upgrade.