tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 57622d057844268cfe28d57272af390eb063321e
parent 3a40216fa0bb303c67730cf263846fd75736a052
author Hyunyoung Song <hyunyoungs@google.com> 1479952888 +0000
committer android-build-merger <android-build-merger@google.com> 1479952888 +0000

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

Change-Id: I9771f7311fd49a535e91fc559024c9e17cff8cbb