tree edf78c92d5786b2aa2b25c64858c088bc2ff8f2a
parent d9855a8dbed211de6e1c1cf55e20201349c40432
parent 62c863d257f08dfc69b6870d56d7a34c9e90ed51
author Gilles Debunne <debunne@google.com> 1283969359 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283969359 -0700

Merge "Added a disabled button and a second text edit in View / Controls"