summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-11 11:23:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-11 11:23:03 -0700
commitf978979d1565ef8aa8b98298cfca09044cb22ba6 (patch)
treef690eff8d78ac454081569c9999b112340bada8b /docs/html/sdk/api_diff/15/changes
parentbe782a6aa0f7c656ed0dce468b9722c3acde8358 (diff)
parentb8c6405fda9c41541868773f40ddd29bb1fc7ed8 (diff)
am b8c6405f: resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp
* commit 'b8c6405fda9c41541868773f40ddd29bb1fc7ed8': Performance: Activity manager perf unnecessary recalc of oom_adj
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions