diff options
| author | Andrew Lee <anwlee@google.com> | 2014-06-04 21:22:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-04 21:22:07 +0000 |
| commit | dbeff93d3e647c7429d330d8a5dcecbd21758546 (patch) | |
| tree | e6c770a52e41eab9b9ee253329822f202e5f2a46 /res/values/styles.xml | |
| parent | d9b4f21b6716a1fd8bce82f5c3927ce3f51f7823 (diff) | |
| parent | d871e55135489cb2090287acd757bfb5976beacb (diff) | |
Merge "resolved conflicts for merge of 4d135767 to master"
Diffstat (limited to 'res/values/styles.xml')
0 files changed, 0 insertions, 0 deletions