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


Trivial merge