tree 67d36c95acebb0690e7533e3540d36f504164fe5
parent de1a3a18ed14c9cbdd99330f3328802f31deb313
parent 77e6e3464400bf3901b5f4ce740421f642a6b590
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1530917707 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1530917707 +0000

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644

Change-Id: I87ad6c5bad9275df8b1a131b3ac0daf7ec8ed5e4