tree 1243a69312ad599e35dd06efec53681c44292bc1
parent f9c36dd2c8803e9a83fc5307069ed569a5c3799f
parent 3a40216fa0bb303c67730cf263846fd75736a052
author Hyunyoung Song <hyunyoungs@google.com> 1463089607 +0000
committer android-build-merger <android-build-merger@google.com> 1463089607 +0000

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

* commit '3a40216fa0bb303c67730cf263846fd75736a052':

Change-Id: I7c477e7924d9500be1ab2eb7c26a530a45e1cc33