| commit | 28193403ecefb3f222f1e383adf4f9b331ebebcf | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Wed Jun 24 08:20:11 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 24 08:20:13 2015 +0000 |
| tree | f9b1cd1dffc0ead8d35433c0e83537b65078d31c | |
| parent | 9ff4326fe5136a9e6b40c7e6573720efa89013cd [diff] | |
| parent | a577676a64e5353b8ec927117151aa6be84adf66 [diff] |
Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev