summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-01-29 14:54:43 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-29 14:54:43 -0800
commitd2ed82fb9423afe744780f66c667bb98261d3a6a (patch)
treee4b0af94742cd7424e51627b244d6f95c97a5491 /docs/html/sdk/api_diff/15/changes
parent450536b6a6139393c61aefc0ad57544eda5bfe8b (diff)
parent66700397496fc6f6d26f9f0b56ead8ef610b9654 (diff)
am 66700397: Merge 3100207b from gingerbread-plus-aosp
* commit '66700397496fc6f6d26f9f0b56ead8ef610b9654': Tweak to make merges easier
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions