tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 7a7fb940e1d221cb806bd35f46ccd3ce8c6455a6
parent b9ef562e9377f0d4e526becbea750663a07dd073
author Hyunyoung Song <hyunyoungs@google.com> 1479953258 +0000
committer android-build-merger <android-build-merger@google.com> 1479953258 +0000

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

Change-Id: Idd9a42eb247b0e4b197cc87a18efe58dff9ec2bd