tree d6f8225807e7215dd5ab17fe23253574ddd96712
parent e44a47881e2849fa2d4e0f45e5cf6aa1595c0e8d
parent ec3f3b92f0d3e545f1921b6111a34541000f416c
author Adam Cohen <adamcohen@google.com> 1339181562 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339181562 -0700

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

* commit 'ec3f3b92f0d3e545f1921b6111a34541000f416c':
  Fix two pieces of folder jank