tree 76d7b267a8dc2d8d01052923eb9d40547247c3cb
parent 57f7ccc4223ad7f51aa41b593ed26770f3cca22b
parent 001c7d1281b999f1ebfff8cb0d18773d6d9e1e74
author Andy McFadden <fadden@android.com> 1288211129 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288211129 -0700

am 001c7d12: Merge "Set capabilities sooner." into gingerbread