| commit | 025760e00ff7b0baa21981ff79784861841f8f19 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Wed Jun 24 09:45:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 09:45:16 2015 +0000 |
| tree | ff2f0a22cbbc93e4989d05720b2ec942a50969ab | |
| parent | 8437626f65b5a28b0dd63ebf532d1a7adf64fb8a [diff] | |
| parent | 28193403ecefb3f222f1e383adf4f9b331ebebcf [diff] |
am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev * commit '28193403ecefb3f222f1e383adf4f9b331ebebcf': Prefix design lib resources to try and avoid conflicts