tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 331cc230af500604eb9b5b8435bdd7fac6427084
parent e878f1c719f4aed24c02957aef8f2ea5af20b6cf
author Hyunyoung Song <hyunyoungs@google.com> 1479953127 +0000
committer android-build-merger <android-build-merger@google.com> 1479953127 +0000

Merge "Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7" into nyc-mr1-dev-plus-aosp am: 3a40216fa0
am: e878f1c719

Change-Id: I4690e7c5917fc321ee0f0982f2041850dd2a8937