tree adec82d77c993032c3df51c1ebd299fa68f9364f
parent 15aebbbe53a9e14f0f5edb8bcb6f8b328497e102
parent 544efa76639b46e4177b385d498fca60c8b6ded5
author Craig Mautner <cmautner@google.com> 1409878785 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409878786 +0000

Merge "Prevent recursion in resumeTopActivityLocked" into lmp-dev