OSDN Git Service

am 9dc454b1: merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 19:14:06 +0000 (12:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2009 19:14:06 +0000 (12:14 -0700)
commitda29b263feb097415c8b36fb2eb930e4544495f4
treeedc5b401822d08af51fc3aa6fa033c1478be4d76
parent8b1558c551a7ef9cce5db0ee93f51ab28f6832ec
parent9dc454b1b175af7f94b264295165d84e0abc8f80
am 9dc454b1: merge from open-source master

Merge commit '9dc454b1b175af7f94b264295165d84e0abc8f80'

* commit '9dc454b1b175af7f94b264295165d84e0abc8f80':
  Updated to better distinguish between options and operands
  Enhancement: ApiDemos - App - Dialog - AlertDialog with MultipleChoices backed by Cursor