tree c028bfe537607823c37e2ffc8c713c73059d3130
parent f763e53abbf22a83b8c5de83d9056c74ef0fbb88
parent b90ed0a96d9c8eb93f00aa283d3d550fa92b02a8
author Bjorn Bringert <bringert@google.com> 1422685375 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685375 +0000

am b90ed0a9: am 74a8794b: am ebdb7fcc: am 2ed99e86: Build Launcher3 against prebuilt SDK 21

* commit 'b90ed0a96d9c8eb93f00aa283d3d550fa92b02a8':