tree d6f8225807e7215dd5ab17fe23253574ddd96712
parent 07e4579f60dc25ce1ad610d780ef62abebdaf9f4
parent 268c4751b547e1470a94030af73a4e7bb8ea221e
author Adam Cohen <adamcohen@google.com> 1339181396 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339181396 -0700

Merge "Fix two pieces of folder jank" into jb-dev