tree 96beaf07307486f6491f022da63ebe381765d1a8
parent 96f2023405168354e8dc90b649b785c170d15138
parent bc4ddd02f2eedb2cc12db9ea04d3853d76278d28
author Hyunyoung Song <hyunyoungs@google.com> 1438114721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438114721 +0000

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

* commit 'bc4ddd02f2eedb2cc12db9ea04d3853d76278d28':