am 03523248: am d8478225: Fix onStart/onCreate race in instrumentation.
authorJarkko Pöyry <jpoyry@google.com>
Fri, 8 May 2015 23:05:50 +0000 (23:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 May 2015 23:05:50 +0000 (23:05 +0000)
* commit '0352324866a7d7bc1824637d86596453447c3bfe':
  Fix onStart/onCreate race in instrumentation.


Trivial merge