tree b05495bae0087f192d2f2fe4d4bbd5af48eadacc
parent 5b3607397d386bed5665b59311827c206989b8cf
parent 1f0d5cb41f441fdb1656a71f581c3b38f1086288
author Winson Chung <winsonc@google.com> 1428441052 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428441052 +0000

am 1f0d5cb4: Merge "Fixing issue with building velvet against lower support lib." into ub-launcher3-burnaby

* commit '1f0d5cb41f441fdb1656a71f581c3b38f1086288':
  Fixing issue with building velvet against lower support lib.