summaryrefslogtreecommitdiffstats
path: root/libs/gui/Android.mk
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-11-29 11:51:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-29 11:51:20 -0800
commit4a0994e4ab4ecffe063511acf70d4cfaaed6c2cc (patch)
treea3d18908fc1414742d97c93484de26b7ac8fffb9 /libs/gui/Android.mk
parent8219e9122efece0dd6741d2fe94fd6a82dc5df89 (diff)
parent46b547efd816e6cf7b89e58a48e2a0a3f40b7d04 (diff)
downloadframeworks_native-4a0994e4ab4ecffe063511acf70d4cfaaed6c2cc.zip
frameworks_native-4a0994e4ab4ecffe063511acf70d4cfaaed6c2cc.tar.gz
frameworks_native-4a0994e4ab4ecffe063511acf70d4cfaaed6c2cc.tar.bz2
am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '47af771d708c8eb8f7debf7e295d609491f03cc8': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/gui/Android.mk')
0 files changed, 0 insertions, 0 deletions