tree 12ed99df76b9a8167bb9688efec40158105e92f7
parent b5e2107dfbd9605497b63f07354ef97f419827d0
parent 3288171507ae38bce261dcf94cfae08392d961c2
author Sunny Goyal <sunnygoyal@google.com> 1436297653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436297653 +0000

am 32881715: Merge "Updating makefile to use the current SDK" into ub-launcher3-burnaby

* commit '3288171507ae38bce261dcf94cfae08392d961c2':
  Updating makefile to use the current SDK