OSDN Git Service

am d4ee2de1: (-s ours) am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
authorYing Wang <wangying@google.com>
Tue, 24 Aug 2010 18:02:12 +0000 (11:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 18:02:12 +0000 (11:02 -0700)
commitfbc192de17ca78c27ba08c981ae82534b6b2b301
tree681ca20c5267d885fddaa72462b580d4b178c79d
parent6d301921b5eefb444685569e468dfae3b29ed7ce
parentd4ee2de1c3b5163926d40879277e6e35ea40924c
am d4ee2de1: (-s ours) am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]

Merge commit 'd4ee2de1c3b5163926d40879277e6e35ea40924c'

* commit 'd4ee2de1c3b5163926d40879277e6e35ea40924c':
  Restore OTA for crespo. [DO NOT MERGE]