am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."

* commit '25be2c725eba1c94c7fc700e37b194fdcd83a1fb':
  Fix of tearDown() in SingleLaunchActivityTestCase.
tree: 1c6db7a9e7e55e8c51db4bd409c033b5adc03a55
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE