OSDN Git Service

am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
authorScott Main <smain@google.com>
Tue, 8 Dec 2009 00:39:04 +0000 (16:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 00:39:04 +0000 (16:39 -0800)
commit0be5c863a204cc37fda35574c3111ac363b26b17
treefbb5171cef7200e2e74e62d1cc9f26c605ce675e
parentb16659533e55476bbe2c0b177943ef8f4129e34a
parenta2496682f9c6f9311199df7300bb8e16298cf40d
am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair

Merge commit 'a2496682f9c6f9311199df7300bb8e16298cf40d' into eclair-mr2-plus-aosp

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