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)
Merge commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb' into kraken

* commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb':
  DO NOT MERGE


Trivial merge