tree 5203f2af5a66ece36ded5e319ff19e96a8f20f0b
parent 42c725fe683914885196914ec8bf1fa4b39f87a0
parent f05545fcc2df05518731f8d7ff048d797fe776d5
author Anjali Koppal <akoppal@google.com> 1394670111 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1394670112 +0000

Merge "Make FolderIcon.getFolder() public and add Folder.getContent()." into ub-now-mister-ugly