tree dd25eedf17a894b8df77774675bbff00b1ee716b
parent 08455e6b6d366c4c5c08eca861a1c38b5fa032dd
parent ab1760f50f0ed49e7e4c3befb3eb0e4982617d51
author Jorim Jaggi <jjaggi@google.com> 1504222593 +0000
committer android-build-merger <android-build-merger@google.com> 1504222593 +0000

Merge "Fix stuck activity" into oc-mr1-dev
am: ab1760f50f

Change-Id: I47e8c406d4f6bce9b7d6a3ca6fcfd1dfe20174e9