tree 9d02fe922b578dacb56376d31706f58bca355c50
parent 60281b887e11a43a5338263618605e9c72af15b0
parent b5c400718b33a5741b177bfe060363cc4abd63c5
author Daniel Xie <dxie@google.com> 1443479241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443479241 +0000

am b5c40071: am 56e36955: am c2869bed: am 5555241f: Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev

* commit 'b5c400718b33a5741b177bfe060363cc4abd63c5':
  fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)