OSDN Git Service

am 99096976: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:36:11 +0000 (09:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 May 2010 16:36:11 +0000 (09:36 -0700)
commit08d3110279ccacb0103273b496c87d74c0f3a385
tree78089b6f4404cd3029167e5adf5dd72660132e3d
parent529ba2e5f2f93d6705724ae1b8b339aae13b8977
parent99096976d0ed8436c0eacdefae0ffb606bd573c5
am 99096976: merge from open-source master

Merge commit '99096976d0ed8436c0eacdefae0ffb606bd573c5' into kraken

* commit '99096976d0ed8436c0eacdefae0ffb606bd573c5':
  Added missing --pct-syskeys to processOptions in Monkey