tree f1a36c84ae8e3fbec4840302df6cff6897ce87c3
parent 5329715a740ded5d0e8a3196ed82a498693eb855
parent 10b2fee05f3704ee65cd3730c3d0e2cdb5ac26e2
author Sid Soundararajan <ssoundar@google.com> 1467231228 +0000
committer android-build-merger <android-build-merger@google.com> 1467231228 +0000

Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am: 10b2fee05f

Change-Id: I8b7783bbe4924437494f0ed5857ee81f574fe8b1