tree fe9ed94353b09dda232fceb64691f96dcd5db8d3
parent cc619e2eca624d293e0e7f65f82305a5d925dbf7
parent 5bd11fd60e06807a6709e1aaf16ce3c9d2448f97
author Hyunyoung Song <hyunyoungs@google.com> 1438112298 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438112298 +0000

am 5bd11fd6: am 0e3c5e87: am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts

* commit '5bd11fd60e06807a6709e1aaf16ce3c9d2448f97':