OSDN Git Service

am fc4787f7: Merge "Make FolderIcon.getFolder() public and add Folder.getContent...
authorAnjali Koppal <akoppal@google.com>
Thu, 13 Mar 2014 00:23:48 +0000 (00:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 00:23:48 +0000 (00:23 +0000)
commited273c22c47ad84c550a59b5f233a97f4141ee28
tree5203f2af5a66ece36ded5e319ff19e96a8f20f0b
parentfe845c4ed122adfdd09695f21e5dac12660022e6
parentfc4787f7be3f05a3e8ccb393be1aaa5c9610c154
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().