summaryrefslogtreecommitdiffstats
path: root/include/gui
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-11-17 05:45:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 05:45:54 -0800
commit6c932dab1cef4fc711c4fdab938bced67b15d5df (patch)
tree75b7534f88b3c7e46dbadc97b9c86862f5860cbe /include/gui
parent664d87ef01f7b4dbd7c96f23db73aba6cbc57481 (diff)
parent02ed923da995a10c537018861cfc149d04c66bc2 (diff)
downloadframeworks_base-6c932dab1cef4fc711c4fdab938bced67b15d5df.zip
frameworks_base-6c932dab1cef4fc711c4fdab938bced67b15d5df.tar.gz
frameworks_base-6c932dab1cef4fc711c4fdab938bced67b15d5df.tar.bz2
am 02ed923d: (-s ours) am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '02ed923da995a10c537018861cfc149d04c66bc2': Import revised translations. DO NOT MERGE
Diffstat (limited to 'include/gui')
0 files changed, 0 insertions, 0 deletions