tree 45f4c1fa50652ea4e98503b68dd9bc464af4ede3
parent 764ff7513a47da76a59fee7c5f299afb7662aac6
parent 036832adba9d953f8d34ece1bd5b049f02437928
author Tom O'Neill <tomo@google.com> 1260494508 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260494508 -0800

am 036832ad: Merge change Ic944ab1e into eclair-mr2

Merge commit '036832adba9d953f8d34ece1bd5b049f02437928' into eclair-mr2-plus-aosp

* commit '036832adba9d953f8d34ece1bd5b049f02437928':
  Extract and check in NotepadCodeLab.zip for change tracking