tree 13d426db68f227f1a02d9be5548846943acf859d
parent 9d33dac7f15991547de0d4b397b8de0f20f37a22
parent f23f328513b3ec14b5b0affd2b1745e82b7dec0e
author Roozbeh Pournader <roozbeh@google.com> 1484338096 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484338096 +0000

Merge "Rename language+country resources to just language"