tree aceda893e1a3a220199b0658033951f3eb82b5a4
parent e836a229aefb0ff3b82e19a422590fb7c4bd5148
parent fce23748c49e0c303efd72296dcdba13b099f622
author Winson Chung <winsonc@google.com> 1438370451 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438370451 +0000

Merge "Ensuring that we don't try to use and propagate null activity labels." into mnc-dev