tree 0643645ba90ba666ddf7ff7188aba1ea145193de
parent 75576617874241136000f885fb724d0d4c1829cd
parent cab2fa779ec3f4bdb0941a631effa34c9da70695
author Arthur Ishiguro <arthuri@google.com> 1531343610 -0700
committer android-build-merger <android-build-merger@google.com> 1531343610 -0700

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

Change-Id: Ifdd69396d202951f8b9ed5fe6e5766133955a5e5