OSDN Git Service

am 64b1e85c: (-s ours) am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT...
authorXavier Ducrohet <xav@android.com>
Thu, 1 Oct 2009 18:46:36 +0000 (11:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Oct 2009 18:46:36 +0000 (11:46 -0700)
commit6c18e497908e1edfe95ef61ba2b1e403fd3f6bec
tree980c4d5a8e6f9bbbba3a9f11cae2e5b358c67f76
parent7b25907d8156ac2048ec2398a9641880835789ab
parentdad7d042a67dddd78073640eecac2a6ae17e5324
am 64b1e85c: (-s ours) am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)

Merge commit '64b1e85ce910c4282cc5ca94f800f6103ace2d0b'

* commit '64b1e85ce910c4282cc5ca94f800f6103ace2d0b':
  Move to 1.6_r2 (DO NOT MERGE)