tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 5d6217dc0399a64466c28f9c3dd07585345b3f65
parent 331cc230af500604eb9b5b8435bdd7fac6427084
author Hyunyoung Song <hyunyoungs@google.com> 1479953247 +0000
committer android-build-merger <android-build-merger@google.com> 1479953247 +0000

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

Change-Id: I174d73c8b78b602b1b15c315ee0faf537ebefca6