mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-05 08:35:26 +00:00
557dca1b5e
This will resolve conflicts when introducing the android design support library in bug 1189306. --HG-- extra : commitid : 6mkNPj0xng4 extra : rebase_source : 3feee4e9f361cb3e18e7c7c02f6ec206de6cb015 |
||
---|---|---|
.. | ||
android | ||
locales |