tree 8e955719be31c9ed032340e5931b893dc28ebf81
parent 25434136edd0a31bb6184f53a2774644a5c1928d
parent 2d926648d59ef70d04d832a1ef2d023ff45dfd72
author Yu Ping Hu <yph@google.com> 1381770841 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381770842 +0000

Merge "Re-enable the ping kick." into jb-ub-mail-ur10