| commit | ee4a34c2f5c25b98e575caa4f180db304dbe4e4e | [log] [tgz] |
|---|---|---|
| author | Angie Chiang <angiebird@google.com> | Wed Jun 07 15:23:17 2017 -0700 |
| committer | Angie Chiang <angiebird@google.com> | Thu Jun 08 00:35:16 2017 +0000 |
| tree | dc0fe6dc07fc8b6f1207f2d7eb7b84ff891bc768 | |
| parent | d61e608d7a40637a4e185a6d92fe9cde90be564d [diff] |
Fix conflict between lv_map and cb4x4 Change-Id: I0512000554ef74d397332e5ed135fe20e2c4a37e