OSDN Git Service

Merge "Fix activity weirdness by doing the right thing" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 10 Feb 2016 18:06:56 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Feb 2016 18:06:56 +0000 (18:06 +0000)
commit24f6a0eebcd11652e4ed80b1b56a9754f5d9db60
tree53e6b080a43808b9c65180836d6cc128e51821a2
parentab242afe1eabac113c1e4fcd89fc98a637d89d0f
parentdb26d19302ea7b0bd169907809b58044e7fbff10
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
am: db26d19302

* commit 'db26d19302ea7b0bd169907809b58044e7fbff10':
  Fix activity weirdness by doing the right thing