tree 792fb26820942562d5d0c7518b7e4707a76f1615
parent 38f3fc2c4151d23d7390a8a8ee0f1b34ecd2ef32
parent 9ae2eb2e586d43f92c6339e9d7072ec1eef3f0ed
author Neil Fuller <nfuller@google.com> 1406548638 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406548638 +0000

am 9ae2eb2e: Merge "Fix Harmony-707 test for CTS"

* commit '9ae2eb2e586d43f92c6339e9d7072ec1eef3f0ed':
  Fix Harmony-707 test for CTS