summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-20 16:13:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-20 16:13:54 -0700
commit070a19e035cd28f2a0cc831f2322f2121d80de44 (patch)
tree714d23f6081489a5504fdbe262456f43f4f48c68 /tools/aidl/generate_java.cpp
parent5a6bec53e224b2db9ecbc6920faab08f4a962256 (diff)
parent5c8caba2e590792531ffb2c9f4ea924993662abd (diff)
am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
* commit '5c8caba2e590792531ffb2c9f4ea924993662abd': Add ParcelFileDescriptor.fromFd() and .adoptFd().
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions