summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/SyncOperation.java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-11-16 17:59:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-16 17:59:25 -0800
commitee16821464479fd71e5c7090f135f0ae60c45b75 (patch)
tree9f9bda762dac9a377a0467e61d810866ef471a9d /core/java/android/content/SyncOperation.java
parentd8d1b05e4a3fe08d484e349c0d63a296018288a6 (diff)
parent3e932c45c6ed698a44b73bc1b06a1bca07205e14 (diff)
downloadframeworks_base-ee16821464479fd71e5c7090f135f0ae60c45b75.zip
frameworks_base-ee16821464479fd71e5c7090f135f0ae60c45b75.tar.gz
frameworks_base-ee16821464479fd71e5c7090f135f0ae60c45b75.tar.bz2
am 3e932c45: (-s ours) am 0c78d9ef: am e007c0e8: am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '3e932c45c6ed698a44b73bc1b06a1bca07205e14': Import translations. DO NOT MERGE
Diffstat (limited to 'core/java/android/content/SyncOperation.java')
0 files changed, 0 insertions, 0 deletions