tree 7be55e3c06ab2706a8117883b1dfc1a9eb3976aa
parent 10d03955def60ffa28717cd113c74a18219e2e81
parent 2ed99e861b4be73620fd6fdc24a13230e096921c
author Bjorn Bringert <bringert@google.com> 1412109253 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412109253 +0000

am 2ed99e86: Build Launcher3 against prebuilt SDK 21

* commit '2ed99e861b4be73620fd6fdc24a13230e096921c':
  Build Launcher3 against prebuilt SDK 21