summaryrefslogtreecommitdiffstats
path: root/docs/html/tools/help
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-03-07 19:40:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 19:40:33 +0000
commit81f6bccae1ac7f483356dd2083498298c2f4a05e (patch)
tree5079a56bfa29894a60cf9f894ff91c47ad20d6a8 /docs/html/tools/help
parentae69111e23fc24491f112a74d2392b117b83e8df (diff)
parent23ef1b5e0b84e3bb726454b97846f91f2efad212 (diff)
downloadframeworks_base-81f6bccae1ac7f483356dd2083498298c2f4a05e.zip
frameworks_base-81f6bccae1ac7f483356dd2083498298c2f4a05e.tar.gz
frameworks_base-81f6bccae1ac7f483356dd2083498298c2f4a05e.tar.bz2
am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212': A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
Diffstat (limited to 'docs/html/tools/help')
0 files changed, 0 insertions, 0 deletions