tree 5203f2af5a66ece36ded5e319ff19e96a8f20f0b
parent fe845c4ed122adfdd09695f21e5dac12660022e6
parent fc4787f7be3f05a3e8ccb393be1aaa5c9610c154
author Anjali Koppal <akoppal@google.com> 1394670228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394670228 +0000

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

* commit 'fc4787f7be3f05a3e8ccb393be1aaa5c9610c154':
  Make FolderIcon.getFolder() public and add Folder.getContent().