OSDN Git Service

am 69d6c2cc: Merge "Update"
authorJean-Baptiste Queru <jbq@google.com>
Fri, 11 Feb 2011 20:32:38 +0000 (12:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Feb 2011 20:32:38 +0000 (12:32 -0800)
commit423d942e6dc1e2051466e70d71520ab2e4273ea1
tree1e5c5aa841453f121ecd122099f17accbc249341
parentb35d80f0b0a6d87ba20aa2de594db19a0ccf93df
parent69d6c2ccd943f43e87445d00e96eb98deb690ea1
am 69d6c2cc: Merge "Update"

* commit '69d6c2ccd943f43e87445d00e96eb98deb690ea1':
  Update