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)
* commit 'fc4787f7be3f05a3e8ccb393be1aaa5c9610c154':
  Make FolderIcon.getFolder() public and add Folder.getContent().


Trivial merge