tree 4ff7198df257f3a36c5c5b6a522aab186600e6e7
parent cd2a5a15c0ff9df4e25056373202a235517d6427
parent ebdb7fcc8ca851390bcf276929e8990ba23b6869
author Bjorn Bringert <bringert@google.com> 1422666559 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666559 +0000

am ebdb7fcc: am 2ed99e86: Build Launcher3 against prebuilt SDK 21

* commit 'ebdb7fcc8ca851390bcf276929e8990ba23b6869':