am 1ecc7da0: (-s ours) am 4a546f5f: DO NOT MERGE: Backport AttachmentProvider security fix

Browse Source

Merge commit '1ecc7da07ff085d4c23636d4fdd7eaaf0640d026'

* commit '1ecc7da07ff085d4c23636d4fdd7eaaf0640d026':
  DO NOT MERGE: Backport AttachmentProvider security fix

...

This commit is contained in:

Marc Blank 2010-10-21 17:23:45 -07:00 committed by Android Git Automerger

parent 8c3629c978 1ecc7da07f

commit 7ace73d7f0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available