tree d196bd04427b1da09d2cf6d89b40369063ae0927
parent f3428a9820b995b6a91439aacc4317400462c719
parent 04ac4faab0336e30f0879311432a2377e2631df1
author Adam Cohen <adamcohen@google.com> 1430964918 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430964918 +0000

am 04ac4faa: Fix build in ub-launcher3-master

* commit '04ac4faab0336e30f0879311432a2377e2631df1':
  Fix build in ub-launcher3-master