tree 990830ebcea7dce01f006c9e29692c708dd018bd
parent 14f66e4501d23558f3feaabe095b98d3646f76de
parent 84206dab52b1244c8e1aac6905b0b5b33e89b5e0
author Sunny Goyal <sunnygoyal@google.com> 1428630227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428630227 +0000

am 84206dab: Merge "Build fix" into ub-launcher3-burnaby

* commit '84206dab52b1244c8e1aac6905b0b5b33e89b5e0':
  Build fix