tree 4cc30d534c9647b9ffada0ddb98502b80078926b
parent 923850304a00d337e8bd76000c8ff480df25e7e2
parent 92e0c86fa2b84619ebc3acb6d91434dd17113c61
author Winson Chung <winsonc@google.com> 1438371810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438371810 +0000

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

* commit '92e0c86fa2b84619ebc3acb6d91434dd17113c61':
  Ensuring that we don't try to use and propagate null activity labels.