tree 631f292f06f13d22620bfd68f94ab1e55b717cf4
parent b026fa1ffcbcc97ecc609213a3e7b729591fb67d
parent b793668bd851c51ba1ff5ab3364bf5619404ea45
author Chenjie Luo <cjluo@google.com> 1414266849 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414266849 +0000

am b793668b: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev

* commit 'b793668bd851c51ba1ff5ab3364bf5619404ea45':