summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/guide_toc.cs
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2010-04-10 11:48:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:48:06 -0700
commit45c566e98a9867ef462e4d13d02f316aca2f99b9 (patch)
tree59139e5f2fd936ad90b66c41cb17996811536883 /docs/html/guide/guide_toc.cs
parent50e0d9ae3162245cfc606fa32a908fce3eac759e (diff)
parent6e40664fc75e25ebeafda883fc2bba27279bebdd (diff)
downloadframeworks_base-45c566e98a9867ef462e4d13d02f316aca2f99b9.zip
frameworks_base-45c566e98a9867ef462e4d13d02f316aca2f99b9.tar.gz
frameworks_base-45c566e98a9867ef462e4d13d02f316aca2f99b9.tar.bz2
am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Merge commit '6e40664fc75e25ebeafda883fc2bba27279bebdd' into kraken * commit '6e40664fc75e25ebeafda883fc2bba27279bebdd': Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
0 files changed, 0 insertions, 0 deletions