tree ff2f0a22cbbc93e4989d05720b2ec942a50969ab
parent 8437626f65b5a28b0dd63ebf532d1a7adf64fb8a
parent 28193403ecefb3f222f1e383adf4f9b331ebebcf
author Chris Banes <chrisbanes@google.com> 1435139116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435139116 +0000

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