OSDN Git Service

am 9b0ad4c7: Merge change I79580117 into eclair
authorScott Main <smain@google.com>
Tue, 8 Dec 2009 00:33:18 +0000 (16:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 00:33:18 +0000 (16:33 -0800)
commit7fd7dc46f590d5446ddc6b6e84adce4353b5cd5a
treebc5ce2957181abbcf937a6b0eb2a4cfbf2adc494
parent4d523a163aedfbec45983d88d14f11d188eafb26
parent9b0ad4c7258b586f1763bc497e8ed33f42ce446e
am 9b0ad4c7: Merge change I79580117 into eclair

Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp

* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
  docs: add context coloring to code snippets with prettify script