tree 00251c35b954c7de8ddb8292f52e741af32df694
parent 566da1026c33a68157bf9caf93d2071ad2870f46
parent f70696d8cc9b68c1491496de952349866dd6f6ed
author Winson Chung <winsonc@google.com> 1372270891 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1372270891 +0000

Merge "Fixing crash in shrink wrap on tablets." into jb-ub-gel-agar