OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae275c5 a2e6869)
am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not...
authorScott Main <smain@google.com>
Mon, 11 Oct 2010 22:15:09 +0000 (15:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Oct 2010 22:15:09 +0000 (15:15 -0700)
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp

* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
  Revert "docs: new web apps dev guides" Do not merge.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help