OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6c4ad9 753c22c)
am 753c22cf: am 865cd1ca: Merge "docs: update sidenav; move loaders under activities...
authorScott Main <smain@google.com>
Mon, 14 Feb 2011 22:47:11 +0000 (14:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Feb 2011 22:47:11 +0000 (14:47 -0800)
* commit '753c22cfecb04cfdccea3b92197f73e7328d0b15':
  docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/

1  2 
docs/html/guide/guide_toc.cs patch | diff1 | diff2 | blob | history

diff --cc docs/html/guide/guide_toc.cs
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help