tree f8e23431207ebac6f3d86f039f21c1bd101289eb
parent 82bf63fbdff18686ab28e3c510e3b2dda9046979
parent 2da21e64592f5016b78d3cc0fb533ded35d12ca3
author Hyunyoung Song <hyunyoungs@google.com> 1440677794 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440677794 +0000

am 2da21e64: (-s ours) am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts

* commit '2da21e64592f5016b78d3cc0fb533ded35d12ca3':