tree f9272a31dc109af01570df3d659a441a5131a65f
parent 97930fc88bed4240b23fdca24b7817cad888367a
parent 988f263d5abef3488a5757f8f688953061d9403e
author Chris Banes <chrisbanes@google.com> 1428492274 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428492275 +0000

Merge "Disable design lib in master build file" into lmp-mr1-ub-dev