tree 72a1d1612b87ce8a25d0bd21ec12248fbb600ea4
parent 4894346811e73e986d4dcb6abe09df811ee49d44
parent c44de1adcf57c52ee93b4a9d2f4505e17b6cc857
author Hyunyoung Song <hyunyoungs@google.com> 1434665860 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434665860 +0000

am c44de1ad: Merge "Revert resource name to what platform ui automator test defines. b/21923650" into ub-launcher3-burnaby

* commit 'c44de1adcf57c52ee93b4a9d2f4505e17b6cc857':
  Revert resource name to what platform ui automator test defines. b/21923650