tree e2ae021a9e33cf0ec88273f6ec9e7a36ac03ca31
parent 476769b42f38ebf943ea859d98faa94fdc38eec1
parent 6c285977a0dc9605348bd9530282c7d006cbf8bd
author Dianne Hackborn <hackbod@google.com> 1314668421 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314668421 -0700

Merge "Fix issues 5158104 and 4981556 (fragment problems)"