tree 50de502718ca6bf4cf432ab4316987b796ad82bf
parent ee1fa39520d6a7d5326f26b90140ebaf24ce7923
parent 21a4ccc6275a6a3328fc4951f6942b43b0a7726b
author Winson Chung <winsonc@google.com> 1435599672 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435599672 +0000

am 21a4ccc6: (-s ours) Merge "Add extras required for compilation" into ub-launcher3-almonte

* commit '21a4ccc6275a6a3328fc4951f6942b43b0a7726b':
  Add extras required for compilation