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

* commit '0352324866a7d7bc1824637d86596453447c3bfe':


Trivial merge