OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0adacd7 74acdc6)
am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code...
authorJoe Onorato <joeo@google.com>
Thu, 16 Sep 2010 16:27:42 +0000 (09:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 16:27:42 +0000 (09:27 -0700)
commitd2ca897f68e21b3381c933c728078fb62c517eed
treee061735652213476dbecfa391275ab3eb2b48c41tree | snapshot
parent0adacd771afe8634290562e5f8a9232fa3345778commit | diff
parent74acdc699babf490427324271efd78da3bbd44e1commit | diff
am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread

Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp

* commit '7747795af508354b3792e497e6a7b4bc749b4007':
  These are not javadoc tags, they are annotations in sample code. Escape them properly.
frameworks/native
About OSDN
Find Software
Develop Software
Help