tree 6076b872b3310e245c1ff55336e297950b6504be
parent 5d60fc8f851cd964471c3de22879b43f31dd3517
parent 13b563bcae015646d19fa9cf2baf7437d4711f8e
author Adam Cohen <adamcohen@google.com> 1389782405 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389782405 -0800

am 13b563bc: Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit

* commit '13b563bcae015646d19fa9cf2baf7437d4711f8e':
  Ensure that hasFirstRunActivity is only called when necessary