tree 7dcd2203c929d226ff0ed56192a9f83cedc53571
parent e9bfed61b805176488b92e2ca973ca9e833a30b7
parent 1328951ca93cf41b1e296af9eebc3d999abde439
author Régis Décamps <regisd@google.com> 1414955987 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414955987 +0000

am 1328951c: am 37998959: Fix ComposeActivityTest

* commit '1328951ca93cf41b1e296af9eebc3d999abde439':
  Fix ComposeActivityTest