tree 7f17abfbd0b95e54e4e38037f5f41dc387633b1d
parent 66818d220fa72b07da7ccfbe9e1080bb0abf7ba2
parent f0859202fe7a216f8e9e3d295e0c2798654939d4
author Dianne Hackborn <hackbod@google.com> 1295401702 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295401702 -0800

Merge "Okay, new plan for dialogs." into honeycomb