OSDN Git Service

am 13a019fe: (-s ours) am 7daa9132: Disable OTA for crespo [DO NOT MERGE]
authorYing Wang <wangying@google.com>
Tue, 24 Aug 2010 17:16:51 +0000 (10:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 17:16:51 +0000 (10:16 -0700)
commit03d60e774df77a2217a68b390ec066780e0bb00b
tree681ca20c5267d885fddaa72462b580d4b178c79d
parent920e102d796b10229c302d366104d2c86094a91a
parent13a019fe32e6a0eb3289ad6142173631ac601391
am 13a019fe: (-s ours) am 7daa9132: Disable OTA for crespo [DO NOT MERGE]

Merge commit '13a019fe32e6a0eb3289ad6142173631ac601391'

* commit '13a019fe32e6a0eb3289ad6142173631ac601391':
  Disable OTA for crespo [DO NOT MERGE]