tree d6f8225807e7215dd5ab17fe23253574ddd96712
parent 5349fb969ddeac7e78724147178b924b01d33ad8
parent 001a17fcf5b825801bc9987cebab9411ce329f9d
author Adam Cohen <adamcohen@google.com> 1339181643 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339181643 -0700

am 001a17fc: am ec3f3b92: Merge "Fix two pieces of folder jank" into jb-dev

* commit '001a17fcf5b825801bc9987cebab9411ce329f9d':
  Fix two pieces of folder jank