diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-12-09 17:20:48 -0800 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-12-09 17:22:31 -0800 |
| commit | 33f6c9f45de876a3e588ec15dda2088afd7a3b5c (patch) | |
| tree | 99cd0c21a13b4bf3ad1c7590511b1e250feb04e7 /packages/SystemUI/res/values-lo-rLA | |
| parent | c73923bcf9f1ec488c04430db9a6de8c03028a2c (diff) | |
| parent | bd5098e6b4a3f21782f140654086c2893fbadd27 (diff) | |
| download | frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.zip frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.tar.gz frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.tar.bz2 | |
resolved conflicts for merge of bd5098e6 to master
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
Diffstat (limited to 'packages/SystemUI/res/values-lo-rLA')
0 files changed, 0 insertions, 0 deletions