OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4738cf 483f713)
am 483f7130: am e4da3934: Merge "docs: move new AIDL doc back into the existing doc...
authorScott Main <smain@google.com>
Fri, 18 Feb 2011 23:14:44 +0000 (15:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Feb 2011 23:14:44 +0000 (15:14 -0800)
* commit '483f7130b593bb79f8ad0740356963aab42ccf54':
  docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools

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