tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent df304a67ec5c3614b4896598e82201ce39748bb0
parent 57622d057844268cfe28d57272af390eb063321e
author Hyunyoung Song <hyunyoungs@google.com> 1479953118 +0000
committer android-build-merger <android-build-merger@google.com> 1479953118 +0000

Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7 am: 896dd9a122
am: 57622d0578

Change-Id: I923238f0f846368db002cfb1614473ab7b0956c1