| commit | a7cda03a4747bd224cd304324abc270fa1609bbc | [log] [tgz] |
|---|---|---|
| author | Adam Skory <skory@google.com> | Wed Sep 11 16:16:19 2013 +0100 |
| committer | Adam Skory <skory@google.com> | Wed Sep 11 16:16:19 2013 +0100 |
| tree | a437a7a883d8abc9ba0cb2de7edde1e80847aead | |
| parent | 3f94640e2657a4afa10e05ecd32845bd688e5b92 [diff] | |
| parent | 7d17de357a7319c02649050c02f452b28f665491 [diff] |
resolved conflicts for merge of 7d17de35 to master Conflicts: core/res/res/values/public.xml Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef