tree 58d174745892b02f03571d396b1adf76092b9926
parent bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1
parent fdceefd8a220a49192755c2a32e129915fb359e1
author Jim Miller <jaggies@google.com> 1270512960 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1270512960 -0700

Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo