summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/16/changes
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-10 19:13:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-10 19:13:46 +0000
commitf26040f05aa54177c6d60df5e45dd2b13cf4388f (patch)
tree04f41e4be9180272d77168760dabf8dfa36628d3 /docs/html/sdk/api_diff/16/changes
parent1fb480998d96f7dc66f27664f8050d50d9d2ff26 (diff)
parent4ce2c654bda8f2a78bf4821ea39b146e626c8b60 (diff)
am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: 4ce2c65 -s ours * commit '4ce2c654bda8f2a78bf4821ea39b146e626c8b60': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/16/changes')
0 files changed, 0 insertions, 0 deletions