summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2015-03-20 23:58:21 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 23:58:21 (GMT)
commit7af8bb3aa9b79aaa72f7598e11fb89f1782e4cbb (patch)
treef5f2cf38e2475ee7ef8ae40a7a0144d7856e0418
parentd5da4b3555b2b9c6a7987b4ae2931ad86d6673d7 (diff)
parent73667881386d1cadeaa966f424af902533719efd (diff)
downloadandroid_packages_screensavers_Basic-7af8bb3aa9b79aaa72f7598e11fb89f1782e4cbb.zip
android_packages_screensavers_Basic-7af8bb3aa9b79aaa72f7598e11fb89f1782e4cbb.tar.gz
android_packages_screensavers_Basic-7af8bb3aa9b79aaa72f7598e11fb89f1782e4cbb.tar.bz2
am 73667881: (-s ours) am 61b83ac2: (-s ours) am ec00b01d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '73667881386d1cadeaa966f424af902533719efd':
0 files changed, 0 insertions, 0 deletions