tree d9cd6a97df8f42a495109e8a46b06db09a9b70cd
parent 46cdd4376775c3b84139f2e4d734ef8affbd605c
parent 909c75864cee351044d5be6dcb21d8e01eded92e
author Kenny Root <kroot@google.com> 1363125860 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363125860 -0700

am 909c7586: Merge "Fix Security2Test counting"

* commit '909c75864cee351044d5be6dcb21d8e01eded92e':
  Fix Security2Test counting