tree fc4ce0cfd59a9c80bf358f8eb7961c363d9412bf
parent c8fabf2cd0068e5d7447356d9f924967080e3986
parent 257ed21d93192f37b792d8dd2c557a0b3051bd9e
author Etan Cohen <etancohen@google.com> 1480631219 +0000
committer android-build-merger <android-build-merger@google.com> 1480631219 +0000

Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470 am: 61eb0bf8fc
am: 257ed21d93

Change-Id: I59d444dc877f07b3a9c9e5f3286c708cd0d6c0e9