summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/14
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-11-12 17:22:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-12 17:22:48 +0000
commit199f8de0278fdf758dfdbb79c80fe721ca4f2cc6 (patch)
tree39bc2b4ff50ab8a8cdb8021f2681473088426afa /docs/html/sdk/api_diff/14
parentd5f3ab7b163d71563311c7dad004e7a54ef1fe49 (diff)
parent6a3e6d13107c01c4a98eb7e333bad1348277498a (diff)
am b3f447e9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: 6a3e6d1 -s ours * commit '6a3e6d13107c01c4a98eb7e333bad1348277498a': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/14')
0 files changed, 0 insertions, 0 deletions