OSDN Git Service

am 97984c41: reconcile froyo-release into gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Mon, 27 Sep 2010 00:39:11 +0000 (17:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Sep 2010 00:39:11 +0000 (17:39 -0700)
commitef5490cf650c65c3c5286a498b1bcdd4882ba237
treeca9ebb8fa7987bef4fafd9f3b310893f702e52e7
parent8317e66433903badaec8ebd2b9ec2b8153f3d612
parent97984c41fe4f8fdca1f24c7bf790bf03b174f90e
am 97984c41: reconcile froyo-release into gingerbread

Merge commit '97984c41fe4f8fdca1f24c7bf790bf03b174f90e' into gingerbread-plus-aosp

* commit '97984c41fe4f8fdca1f24c7bf790bf03b174f90e':
  FRG83
  FRG78
  FRG75
  FRG58B
  FRG58
  FRG57
  include build timestamp in OTA metadata