tree 60fc4fb14796f3805cc61d1861230676931a4ab1
parent 9ff704921d6f737b7ddd9e07a335a3d81c2dbe44
parent d31aeea81b4b3e5fdcb20a36fde0170e9d3004b0
author Jean-Baptiste Queru <jbq@google.com> 1339445213 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339445213 -0700

am d31aeea8: am e26034fc: Merge "CTS Holo: Enlarge the threshold from 1 to 2"

* commit 'd31aeea81b4b3e5fdcb20a36fde0170e9d3004b0':
  CTS Holo: Enlarge the threshold from 1 to 2