OSDN Git Service

Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev
authorAlan Viverette <alanv@google.com>
Thu, 30 Oct 2014 17:38:39 +0000 (17:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Oct 2014 17:38:40 +0000 (17:38 +0000)

Trivial merge