tree b61e2c2e23e4948b0254a744f8251030ccbf8bb4
parent e7599d694313845a41221dfa0d7f6dca3aedd02c
parent 2ed99e861b4be73620fd6fdc24a13230e096921c
author Bjorn Bringert <bringert@google.com> 1413648344 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648344 +0000

am 2ed99e86: Build Launcher3 against prebuilt SDK 21

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