tree 72469ff5e2cc4803f97b54f07a10e54b52973228
parent 247473a238323b1b54c0d4cd376227bb694e4ccd
parent 33587b4e1dd2850e30c35aee0e195a0cae492b68
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1558561082 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1558561082 +0000

[automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d

Change-Id: I5329b9144603c3e53bf8cebb75530e31d56c7e20