tree 3132e2b1acfd3a10380aba376bd9338d1a0dee54
parent fef8a4643836d12254869e840bcec7b820d24245
parent ec22cf46d5830d58e941851dcb0341c1bcd2f3c3
author Hyunyoung Song <hyunyoungs@google.com> 1425327567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425327567 +0000

am ec22cf46: Merge "[unit tests] Setup instrument target for the launcher3 unit test b/19566571" into ub-launcher3-burnaby

* commit 'ec22cf46d5830d58e941851dcb0341c1bcd2f3c3':
  [unit tests] Setup instrument target for the launcher3 unit test b/19566571