summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-10 21:59:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-10 21:59:04 +0000
commit63566590eaa2d1c6dfd1bd2031499823d352376e (patch)
treef6e87eb8431e3629a9af7406e9ce1f6148698722 /docs/html/sdk/api_diff/15/changes
parent513250e31045f1052262217e554765b157ed8cc9 (diff)
parent1fb480998d96f7dc66f27664f8050d50d9d2ff26 (diff)
am 1fb48099: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 83c26e1 -s ours
* commit '1fb480998d96f7dc66f27664f8050d50d9d2ff26': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions