tree e3294c3b2b32cd3532fa9b239326b1aaaa79fc40
parent 6ce4ac13964e2ecb852dba5c2cf35c55929f8fc7
parent 0e3c5e878c2da4f04c71b575bf20e7be41eee6cd
author Hyunyoung Song <hyunyoungs@google.com> 1438110922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438110922 +0000

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

* commit '0e3c5e878c2da4f04c71b575bf20e7be41eee6cd':