tree 186019960f7f6474857d670cf5b22fb8757c6d35
parent 50b556ea0e7d4881ec21ee4584e87a9e3be19d53
parent 82b4f8b396cafeaa0b5597e60a404773a6d633c3
author Joe Onorato <joeo@google.com> 1296438985 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1296438985 -0800

Merge "I declare settings panel icon VICTORY!" into honeycomb