tree edce36aff59355239bbb158e6f5a42e74a32ac5e
parent e8a56c72820599aa368cd5d78fe11bfb631d6141
parent 303e0247b2248a5e1bbecfeb9cf8ce944ef03146
author android-merger <android-build@android.com> 1297303123 -0800
committer android-merger <android-build@android.com> 1297303123 -0800

Merge remote branch 'goog/gingerbread' into gingerbread-release