OSDN Git Service

am 03c92bef: am 1f5be05e: Merge "Implement "show received files" preference item...
authorJake Hamby <jhamby@google.com>
Wed, 26 Jan 2011 21:44:31 +0000 (13:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 21:44:31 +0000 (13:44 -0800)
* commit '03c92beffe6e72cbe69771fb52fb5e1bb9271d95':
  Implement "show received files" preference item.


Trivial merge