am d8478225: Fix onStart/onCreate race in instrumentation. am: 0352324866
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:36:27 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:36:27 +0000 (19:36 +0000)
am: ee800b9369

* commit 'ee800b93690c227b5af699073f8042c15e4c6ce0':


Trivial merge