tree 83fa7dcf2e06ff5252f8714e1d058e8048ca3e43
parent a5d3458c5d4731e28ed70dd902f0d7e4ab13e4c5
parent 5b874897559eb3ad6ac777c7317cfd5d253704f9
author Yu Ping Hu <yph@google.com> 1380933534 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380933534 +0000

Merge "Properly clamp the window size." into jb-ub-mail-ur10