tree 7b6d30b0f71657cec1459a6be43ebc633e287f9c
parent c2e914f174005f5cb4f996877af7bd83ff5a232a
parent fbadda10e0909e4455ae88d72123bedd091da6ed
author Jeff Sharkey <jsharkey@android.com> 1368467488 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368467488 -0700

am fbadda10: (-s ours) am 15be842a: am b49cb25e: DO NOT MERGE. Provider to share private files between apps.

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