tree 302c8f60cef437ae74e3bb5d5a30acc8cb0f5dbe
parent 682deae3eb4f030a430eac00190a8580fa7f55d6
parent 7af216ff04b7f0c3852119b476d8f692edfcaaa7
author Winson Chung <winsonc@google.com> 1429313444 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429313444 +0000

am 7af216ff: Merge "Fixing build." into ub-launcher3-burnaby

* commit '7af216ff04b7f0c3852119b476d8f692edfcaaa7':
  Fixing build.