summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-12-28 05:49:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-28 05:49:55 +0000
commita0877a99ec106ea8887c766029c6e3f4e04bde01 (patch)
treeb38076d0696c7da181957b3ff98df5c8cfec21aa /docs/html/sdk/api_diff/15/changes
parentb71829c781f23a0f99b6489bf2c0a19218d2b128 (diff)
parent4ac5f68b563b432a0728e430c42dafec4045631d (diff)
am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: cecabf4 -s ours
automerge: 4ac5f68 -s ours * commit '4ac5f68b563b432a0728e430c42dafec4045631d': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions