tree 007cf6d151de34f59e49b7345fc34585bc5e843c
parent a0115862ed927e070ff87131fab27f7cde3935b1
parent 4665e63cf4aa8830dc357ccb888246b18058b4c0
author TreeHugger Robot <treehugger-gerrit@google.com> 1488569156 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1488569156 +0000

Merge "Increase timeout for loading archives in tests." into arc-apps