OSDN Git Service

am b715a7c4: Do not merge: Cherry-pick change I21555e92 from master
authorDerek Sollenberger <djsollen@google.com>
Thu, 3 Mar 2011 02:26:16 +0000 (18:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Mar 2011 02:26:16 +0000 (18:26 -0800)
* commit 'b715a7c48aa637ebc2832775ea04567c915f6296':
  Do not merge: Cherry-pick change I21555e92 from master


Trivial merge