tree 5eebdc8ee14bc2af2356c44841521cc953c75286
parent 2a1a308f3bb3f9559461380eb04bfaa0a5554c32
parent 2bea94bac78d8a8ed5030d1e09d48db677e1167d
author Narayan Kamath <narayan@google.com> 1392640260 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392640260 +0000

am 2bea94ba: Merge "Fix up android.core CTS tests."

* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
  Fix up android.core CTS tests.