tree 26aabbed1e24e1dcab6dc6efeec01d69fa5365cf
parent a35f24bc96e1d2d03086ae248508ea5be746a88b
parent 267b960dab63200b6ba4dc53dfc7e7ed064986fc
author Arthur Ishiguro <arthuri@google.com> 1531346843 -0700
committer android-build-merger <android-build-merger@google.com> 1531346843 -0700

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

Change-Id: I78fff5a76a8e1215e3a4235cbe65cc95d0fb8653