OSDN Git Service

am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused features...
authorOscar Montemayor <oam@google.com>
Tue, 30 Mar 2010 02:03:28 +0000 (19:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Mar 2010 02:03:28 +0000 (19:03 -0700)
commitec41806007ecbb56f955ef7a0798a77c65e796ac
tree8652850ea1b71670da1d7dd4420a16676827c007
parent5b0d92c50cf0ae71a3120b00176c5b45d59f5892
parentfe6015b4f6efb3f628859000074705cc08a13c24
am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo

Merge commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb' into kraken

* commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb':
  DO NOT MERGE