tree cf8ab1510a3329aa77b8b5e825058b6bbea794f2
parent 7c6046833370c6a1d1408a86d81cfad7ae7db808
parent 40bff39b47c6989c795915cf5f47bc5be5682907
author Hyunyoung Song <hyunyoungs@google.com> 1426602531 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426602531 +0000

am 40bff39b: Merge "Add dummy string to Launcher3Tests resources to fix build error." into ub-launcher3-burnaby

* commit '40bff39b47c6989c795915cf5f47bc5be5682907':
  Add dummy string to Launcher3Tests resources to fix build error.