tree 1a9d0907a16f3b38ecdc3281e2562e1da2f4387d
parent 2c522fa3b79ce117769a06d9fd0a9b0a9e810be1
parent 536fc99b535f6848752615a1b2bf0cddf8f23491
author Roman Nurik <romannurik@google.com> 1259015312 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259015312 -0800

am 536fc99b: am a7178809: Fresh new change for:   Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).

Merge commit '536fc99b535f6848752615a1b2bf0cddf8f23491' into eclair-mr2-plus-aosp

* commit '536fc99b535f6848752615a1b2bf0cddf8f23491':
  Fresh new change for: