tree 8f5ee22e461be23a8d44a2615040f2cb9ad047d4
parent 89168d5b5b21a032c44c84ea09425d573a5a795f
parent 270c183d17da169befda61db8a04edd7a154befd
author Scott Kennedy <skennedy@google.com> 1379031800 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379031800 -0700

am 270c183d: Merge "Add strings for hierarchical folders" into jb-ub-mail-ur10

* commit '270c183d17da169befda61db8a04edd7a154befd':
  Add strings for hierarchical folders