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