tree ef182f1dc42e0a180cea32f6ffd86300afea0459
parent 66a3993e0289b98313b31d44e1898550efe55c1d
parent 52097a22dfa6fcab0e76b08f4ae083250cb6a5dc
author Adam Lesinski <adamlesinski@google.com> 1408561997 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408561997 +0000

am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

* commit '7d98d0a0c57232d5c00b823cf8ff4fa6ff643e06':
  Fix crash when launching Activities in 'android' package