tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent db0d2d6122f12a6e345e12e27e07a6b7609c5f83
parent 9015be72e4e7bf19dd73c0caa41911d659f2b167
author Hyunyoung Song <hyunyoungs@google.com> 1479952942 +0000
committer android-build-merger <android-build-merger@google.com> 1479952942 +0000

Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 027594fc1b
am: 9015be72e4

Change-Id: I2e1b96f4d3cde3b5657ba39304a1144889dc4114