OSDN Git Service

am 0be5c863: am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
authorScott Main <smain@google.com>
Tue, 8 Dec 2009 22:51:26 +0000 (14:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 22:51:26 +0000 (14:51 -0800)
commite79b9dfc06f5adb617b9a4b2268b9585deaa2531
tree57eb53a2975ab3d2bd026600e6b7dcc6647978d9
parentc7b8601d49cec7dbeeae7b86f3f2526d5e6a45ce
parent0be5c863a204cc37fda35574c3111ac363b26b17
am 0be5c863: am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair

Merge commit '0be5c863a204cc37fda35574c3111ac363b26b17'

* commit '0be5c863a204cc37fda35574c3111ac363b26b17':
  docs: add context coloring to code snippets with prettify script