| commit | b8cf0757cbaa22cdd9f6967f2d7cc7cab47847fe | [log] [tgz] |
|---|---|---|
| author | Leo Wang <leozwang@google.com> | Fri Jan 29 17:25:49 2016 +0000 |
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | Fri Jan 29 17:25:49 2016 +0000 |
| tree | c3c7e9ce8a516c4e570d64663cf8b4c6854031e4 | |
| parent | 0220a207003b9346ddc47f3ef5b4d063432027bd [diff] | |
| parent | 1ad038994a6045b63bd82664968cb3b05c9ac98f [diff] |
Merge "kylin: Fix confict with other bsp" into m-brillo-dev-kylin