tree 145cd6c949d784c9894327fa2e479c66a54487c1
parent b5fcc65e0db6f4efe0ee6cfc1c4c7df5efd42efe
parent ca5fc9fa7dbba6cbab625d4a80f812b7206f0676
author Tavis Bohne <tbohne@google.com> 1463422736 +0000
committer android-build-merger <android-build-merger@google.com> 1463422736 +0000

Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev
am: ca5fc9fa7d

* commit 'ca5fc9fa7dbba6cbab625d4a80f812b7206f0676':
  Messaging doesn't allow sharing of its own files

Change-Id: I812ae5e1b37611a69090e024a858c5813a4a155f