| commit | ed273c22c47ad84c550a59b5f233a97f4141ee28 | [log] [tgz] |
|---|---|---|
| author | Anjali Koppal <akoppal@google.com> | Thu Mar 13 00:23:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 00:23:48 2014 +0000 |
| tree | 5203f2af5a66ece36ded5e319ff19e96a8f20f0b | |
| parent | fe845c4ed122adfdd09695f21e5dac12660022e6 [diff] | |
| parent | fc4787f7be3f05a3e8ccb393be1aaa5c9610c154 [diff] |
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().