summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-10-13 08:56:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-13 08:56:49 -0700
commit745e360103e81facb6641d035c5e3ccc8ace855e (patch)
treea4f4c70c40b834c5c3522d70e61dd05342f42a92 /core/java/android
parent99b1993f079eb372cc495b86fe00feff0c37fca9 (diff)
parent0c265c886b563095172827d39b55a8cd71a19ffb (diff)
downloadframeworks_base-745e360103e81facb6641d035c5e3ccc8ace855e.zip
frameworks_base-745e360103e81facb6641d035c5e3ccc8ace855e.tar.gz
frameworks_base-745e360103e81facb6641d035c5e3ccc8ace855e.tar.bz2
am 0c265c88: Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0
* commit '0c265c886b563095172827d39b55a8cd71a19ffb': MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions