tree dc0fe6dc07fc8b6f1207f2d7eb7b84ff891bc768
parent d61e608d7a40637a4e185a6d92fe9cde90be564d
author Angie Chiang <angiebird@google.com> 1496874197 -0700
committer Angie Chiang <angiebird@google.com> 1496882116 +0000

Fix conflict between lv_map and cb4x4

Change-Id: I0512000554ef74d397332e5ed135fe20e2c4a37e