tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 37b5a7f3f13669c56a327f45af44b81949379915
parent 6095d9ff91d6ba6bd14fdec44d8c95b94442b0ca
author Shirley Yuen <shirleyshukyee@google.com> 1477507267 +0000
committer android-build-merger <android-build-merger@google.com> 1477507267 +0000

 Keep history after reset to  ub-launcher3-calgary-polish am: f268e0bd41
am: 6095d9ff91

Change-Id: I7273299f33e50ba89074ff3bae7761d880488ebb