tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 8fd416a7bee5273a413d76429e55186300df91da
parent 896dd9a122a06b68f73a72a94afc1cd01215a5f5
author Hyunyoung Song <hyunyoungs@google.com> 1479952886 +0000
committer android-build-merger <android-build-merger@google.com> 1479952886 +0000

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

Change-Id: I3ccf8918a212d3248bd5c77cbdfbc0e8ebcb1536