summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/SyncOperation.java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-11-16 17:54:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-16 17:54:41 -0800
commitd8d1b05e4a3fe08d484e349c0d63a296018288a6 (patch)
tree9f9bda762dac9a377a0467e61d810866ef471a9d /core/java/android/content/SyncOperation.java
parent00c78c238316d0abcc12133c5d4b87685395639a (diff)
parente4a2c2e37f94050499f5b5411980fac4d074cce1 (diff)
downloadframeworks_base-d8d1b05e4a3fe08d484e349c0d63a296018288a6.zip
frameworks_base-d8d1b05e4a3fe08d484e349c0d63a296018288a6.tar.gz
frameworks_base-d8d1b05e4a3fe08d484e349c0d63a296018288a6.tar.bz2
am e4a2c2e3: (-s ours) am 8b658253: am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit 'e4a2c2e37f94050499f5b5411980fac4d074cce1': Import translations. DO NOT MERGE
Diffstat (limited to 'core/java/android/content/SyncOperation.java')
0 files changed, 0 insertions, 0 deletions