| commit | 7520e492e75a517b7ff41452318dd56bb9a74c8c | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Wed Apr 20 11:41:00 2016 -0700 |
| committer | Hyunyoung Song <hyunyoungs@google.com> | Wed Apr 20 11:41:00 2016 -0700 |
| tree | 06cf1a55d966bf8fe8184576a85b683a02e25bdf | |
| parent | 43d015643b001b0835227c60a3932833dcbb3ed9 [diff] | |
| parent | fceb9ff0f5855432763d5dc15eeff8e7ce4df0c0 [diff] |
merged ub-launcher3-burnaby-nyc, and resolved conflicts b/28269144 Change-Id: Ie884be65901b8d9c6a912944094b8c45796162ee