summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/11
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-10-31 20:35:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-31 20:35:05 -0700
commit17e08407f87a061bc89e850450585000d950f93c (patch)
tree7ee973f07eb7a91f78bd6e67267f39df20e919db /docs/html/sdk/api_diff/11
parent244c3edc6898f9b1798e3e0141443ce4b399dd7b (diff)
parent971c086ea5e133f875b1656d2de3b5f028b4614f (diff)
am 971c086e: (-s ours) am 5b039844: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev
* commit '971c086ea5e133f875b1656d2de3b5f028b4614f': Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'docs/html/sdk/api_diff/11')
0 files changed, 0 insertions, 0 deletions