summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-08-17 14:41:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-17 14:41:02 +0000
commitab25164792e4d2ae017b0c7745ff4422300af555 (patch)
tree70f4b67e4070e691706d5046f5fc0be7591f3776
parent30298f40b9442f7314e04dab63a7852db95c474f (diff)
parentb7eb4cb9c51115e2b23c06c6a7418f43114a56de (diff)
downloadandroid_packages_wallpapers_MagicSmoke-ab25164792e4d2ae017b0c7745ff4422300af555.tar.gz
android_packages_wallpapers_MagicSmoke-ab25164792e4d2ae017b0c7745ff4422300af555.tar.bz2
android_packages_wallpapers_MagicSmoke-ab25164792e4d2ae017b0c7745ff4422300af555.zip
am b7eb4cb9: (-s ours) am 75d9b0bc: (-s ours) am be5c6575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'b7eb4cb9c51115e2b23c06c6a7418f43114a56de': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions