tree c87392b1b139783cd116428035e511da411b0b92
parent 2c4ea24c49d222582c7e439e461935f18099886c
parent 15be842aab7f1c00c71f3386ec06142ff74e0cd8
author Jeff Sharkey <jsharkey@android.com> 1368467290 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368467290 -0700

am 15be842a: am b49cb25e: DO NOT MERGE. Provider to share private files between apps.

* commit '15be842aab7f1c00c71f3386ec06142ff74e0cd8':
  DO NOT MERGE. Provider to share private files between apps.