tree 52e7e391022c0d1b2976d3405e47d0fdeef251c6
parent 5ea422e39e4156fd8bfd5e6b142903d14a4c4a3e
parent a6631d76a70e495867c14c33c0af6fc779af4149
author Tony Wickham <twickham@google.com> 1446230891 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446230891 +0000

Merge "resolve merge conflicts of 4530aca912 to ub-launcher3-master." into ub-launcher3-master