tree 9aa9171e2b4e393998e8b004b5ef3e09e1584355
parent 9f431335ab377396713b8b386ad7539b2b28eff5
parent c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6
author Ying Wang <wangying@google.com> 1276640262 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276640262 -0700

am c01cf7b9: resolved conflicts for merge of 2b8d2383 to gingerbread

Merge commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp

* commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6':
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.