tree f3cd27033b3e7f8e90c83467087fdecc6bb08632
parent ba716af3e291308fe633a21115fcd615ccd1a0a2
parent c22844a1e53db18c9d6d71989daf1eac92ad01ca
author Scott Kennedy <skennedy@google.com> 1379031663 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379031664 +0000

Merge "Add strings for hierarchical folders" into jb-ub-mail-ur10