summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-04-17 19:36:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-17 19:36:15 +0000
commit61e3991bf64b86de32ad24ffcf1753f0f8a80166 (patch)
tree03e2a1cf34a31ee55b4228cae02e9d9dd52f056a /rs
parentd36e8df7241f2433233377bbc803468c91ae8ad9 (diff)
parent177d9b9a25296d9cbe0f96497a8abf2fe28aa1da (diff)
downloadframeworks_base-61e3991bf64b86de32ad24ffcf1753f0f8a80166.zip
frameworks_base-61e3991bf64b86de32ad24ffcf1753f0f8a80166.tar.gz
frameworks_base-61e3991bf64b86de32ad24ffcf1753f0f8a80166.tar.bz2
am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '177d9b9a25296d9cbe0f96497a8abf2fe28aa1da': Import translations. DO NOT MERGE
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions