am 39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo

Merge commit '39637a37fb0074ad0d86c9f30aab5a0cae9ed26c' into froyo-plus-aosp

* commit '39637a37fb0074ad0d86c9f30aab5a0cae9ed26c':
  Project-lib sample: define lib activity.
  Switch from codename Froyo to API 8.