tree 856b86aca1a1a7df4164f69da427770dd94dabe3
parent 61ceba259d738e04fb1701a1ef79d08040492a32
parent 367910fc6dd41e1d84789b305e6bd9cbafb78fbc
author The Android Open Source Project <initial-contribution@android.com> 1245119350 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1245119350 -0700

manual merge of 367910fc, don't build ota or update packages for sdk or sim

Merge commit '367910fc'