OSDN Git Service

Merge "Remove spurious code from bad merge/pilot error" into dalvik-dev
authorbuzbee <buzbee@google.com>
Tue, 15 Feb 2011 18:40:49 +0000 (10:40 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 15 Feb 2011 18:40:49 +0000 (10:40 -0800)
commite286ffaa5dbb1c4110e6658349cfd5c98147d3cc
tree8ef14c5dc2411e947659b88828345fb0ced09428
parent1a8493cafbdbdcc26f5fbe7ed2cf8bdd01d1b732
parentd3a92b577f11c6357c76dc850c6cbf352ef4c760
Merge "Remove spurious code from bad merge/pilot error" into dalvik-dev