tree 3abc4b16dc99c114ee4e1c79780567de1e6e1e1e
parent fdfcf12931a2427d1d7e95a8b79c4baa0047953f
parent 9bc46b456f8e0d0298648021e4720774b7523c2b
author Adam Cohen <adamcohen@google.com> 1501448551 +0000
committer android-build-merger <android-build-merger@google.com> 1501448551 +0000

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

Change-Id: Idef77b1dda208acce51366e8991e4dfa782d62b4