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)
Merge commit '13a019fe32e6a0eb3289ad6142173631ac601391'

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


Trivial merge