tree 6cd2f9a802ad3725784d818bddd2fc294e6a220e
parent 066ff634e07cd87d5c2bbb18a7d10e5eff10ec97
parent f82f2e80313bb9864d3a93a1e5c98008c50b7904
author Daniel Xie <dxie@google.com> 1445881110 +0000
committer android-build-merger <android-build-merger@google.com> 1445881110 +0000

Merge "CTS verifier issue "Screen Pinning Test will fail"" into marshmallow-cts-dev
am: f82f2e8031

* commit 'f82f2e80313bb9864d3a93a1e5c98008c50b7904':
  CTS verifier issue "Screen Pinning Test will fail"