OSDN Git Service

Merge "DO NOT MERGE - Allowing only a subset of display attributes to get overridden...
authorP.Y. Laligand <pylaligand@google.com>
Wed, 13 May 2015 00:15:10 +0000 (00:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 00:15:11 +0000 (00:15 +0000)

Trivial merge