tree 3abc4b16dc99c114ee4e1c79780567de1e6e1e1e
parent fdfcf12931a2427d1d7e95a8b79c4baa0047953f
parent 9623a6f891a31f1285f360baf77beb335613e7f5
author Adam Cohen <adamcohen@google.com> 1501448341 +0000
committer android-build-merger <android-build-merger@google.com> 1501448341 +0000

merged ub-launcher3-dorval-polish2, and resolved conflicts
am: 9623a6f891

Change-Id: I0eb34275308647e8021c452d59a8c93c57b14ea4