OSDN Git Service

am 4d5b4344: am 84975d53: am 9813216f: Merge "Track 64-bit nio changes."
authorElliott Hughes <enh@google.com>
Fri, 29 Mar 2013 17:26:17 +0000 (10:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Mar 2013 17:26:17 +0000 (10:26 -0700)
commitafc61c6fac3b855236fce1b062e1e2facdea641f
treeb0244822020aa7bad48b5fd10d39c31f89c32720
parenta5bf9b6d355a6a82fc9f00959c744cf32c936953
parent4d5b4344904b099ea60b770df61d4e19bf23ecf1
am 4d5b4344: am 84975d53: am 9813216f: Merge "Track 64-bit nio changes."

* commit '4d5b4344904b099ea60b770df61d4e19bf23ecf1':
  Track 64-bit nio changes.