summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes.html
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-03-25 18:19:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-25 18:19:24 +0000
commit1df9bc5c1d47a09b08d49287d81832e18674bece (patch)
tree654cf7a5e2bdd359020114a653c26657b85f1e7c /docs/html/sdk/api_diff/15/changes.html
parente77786d51f574ca7bbb45df136f92fc7c7d06ffe (diff)
parentd7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b (diff)
am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev
* commit 'd7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b': Move task to top in window manager.
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes.html')
0 files changed, 0 insertions, 0 deletions