tree b4ad4f7d9c268c5fdd83c63abb4148e8d3fb1240
parent 510aea8e491852cf1eddcd53125c46db6aa317dc
parent fc8996212db0d8a8c3a1396352519bf3e2abc271
author Chenjie Luo <cjluo@google.com> 1411764688 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411764688 +0000

am fc899621: Merge "Remove CtsTestStubs" into lmp-dev

* commit 'fc8996212db0d8a8c3a1396352519bf3e2abc271':
  Remove CtsTestStubs