tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 044e71c2d09dcdc24ae9013857aede85f59b5808
parent 2aca1b18207451522a7c78720a97cfb790c345f5
author Hyunyoung Song <hyunyoungs@google.com> 1479952875 +0000
committer android-build-merger <android-build-merger@google.com> 1479952875 +0000

Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 908298f567
am: 2aca1b1820

Change-Id: I3a07802a21b3af9c3dea9afac78083011eda1d47