tree 0e4ccaa3aa7a9da48c0e12c9c5e93ad5b2eaa8a6
parent 7b933a5ef764d4716177dc7f060af823a38fa628
parent 60331a9be74a14051e6e192db69307ce652da2ae
author Hyunyoung Song <hyunyoungs@google.com> 1434665228 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1434665229 +0000

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