tree bc3f6b0b1faf01f161906ea1049d10be239e658f
parent 87e7ec02faa90fe937c8fc7c14612fbb37ba29e1
parent 2c9e5e39dfb7f43101e7d901e9ad13a6966a0c33
author Daniel Xie <dxie@google.com> 1436551905 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436551905 +0000

am 2c9e5e39: am ba3d0a07: am fff9d5a3: am 448ebfff: am 13927d10: am e6e19944: am a18e1fce: Merge "Modify the testcase in 64-bit device & lower density field" into lollipop-mr1-cts-dev

* commit '2c9e5e39dfb7f43101e7d901e9ad13a6966a0c33':
  Modify the testcase in 64-bit device & lower density field