tree 53b59ef168ee64d571b37bc218e787ed5f7cbf6e
parent 2535171fe4898d224101bcce2729904f885b1b7f
parent afa039c96c2587095c588145fbbb2237be51f9bc
author Winson Chung <winsonc@google.com> 1438447975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438447975 +0000

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

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