tree b3bb6fd216508748c3e8bfe66b0b7900d4ab688c
parent 488f2bbe3a7ff2c4945e61649f1428a2303378ad
parent c323791e73e6c788506c3749068d22f0a402b65a
author Jocelyn Bohr <bohr@google.com> 1502507794 +0000
committer android-build-merger <android-build-merger@google.com> 1502507794 +0000

Merge "Enable non-secure side to receive messages > 4K" am: 28fa8b0924 am: 9295f6f36d
am: c323791e73

Change-Id: I142fbd2ce1005489090a0bf287a27bd1946a7ced