OSDN Git Service

am 39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo
authorRaphael <raphael@google.com>
Tue, 6 Apr 2010 21:36:31 +0000 (14:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Apr 2010 21:36:31 +0000 (14:36 -0700)
commitb3c0d6a1d308793a3cf15146560dd24c1e458f1c
tree1c78a507bf1fa79c3928abdc9b0406e0b1c081be
parent7546e9ed6638a8e89b68a9026d226d809b0496d4
parent39637a37fb0074ad0d86c9f30aab5a0cae9ed26c
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.