tree 7603fec4b017fed8cd6a509dcc82871338c70e64
parent 22e217ca72a78cb65fe2dcf3de8297ec447d935f
parent d262387313ad1b72d172174bf91702bce5113684
author Robert Shih <robertshih@google.com> 1444166012 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444166012 +0000

am d2623873: am c2a0993f: am b10b8385: am f6483e84: (-s ours) Add 5-second timeout to testFlacHeapOverflow

* commit 'd262387313ad1b72d172174bf91702bce5113684':
  Add 5-second timeout to testFlacHeapOverflow