tree af45aa2ec0833c2ec8e71ad92f51bc06456be3e7
parent 7ae9440d7f089e55a42836a2053fe4e05c7c36c3
parent 8315bfb08cf70be52ffc3a7cf1bac6528c359257
author Hui Shu <hush@google.com> 1409164212 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409164212 +0000

am 8315bfb0: Merge "Add a CTS test for allowMixedMode." into lmp-dev

* commit '8315bfb08cf70be52ffc3a7cf1bac6528c359257':
  Add a CTS test for allowMixedMode.