diff options
author | Andrew Dolgov <[email protected]> | 2012-12-31 03:15:27 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-12-31 03:15:27 +0400 |
commit | fc4111ae22ad7987bef3fae6f4e61b4adc60064c (patch) | |
tree | 11d78c183452042693bc6e75a7b6f628ef11cf0a /libs/android-support-v4.jar | |
parent | adee6d3493a52a303d3c124768d73b5fa52fb68e (diff) | |
parent | d4e823efcc09a01b88ea37640ea7281b478efc1b (diff) |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb
Conflicts:
res/values/strings.xml
Diffstat (limited to 'libs/android-support-v4.jar')
0 files changed, 0 insertions, 0 deletions