tree c4a95d0d37ec11aaedecb9f5be0d65102fed6992
parent 573c453ad1fa547880a17bd6304f3b7321f6f700
parent 449a8560fbb5d516cbf242ec75cd181749d43e55
author Jorim Jaggi <jjaggi@google.com> 1504224310 +0000
committer android-build-merger <android-build-merger@google.com> 1504224310 +0000

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

Change-Id: If08cfa4718d771d4b4622cc1afed76e1e5424887