summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorTsu Chiang Chuang <tsu@google.com>2012-03-01 17:07:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-01 17:07:38 -0800
commit5e74a8986716e7475c9f0c918887464dbc75401f (patch)
tree5455dbb12761c1c1915817dd40521c8fda256b0e /tools/aidl/generate_java.cpp
parent9eebce976cc64b91a42a7ff562f026cc4b0257f8 (diff)
parent3e70127021f5d5940edfdefd7e33fd65d4ec0449 (diff)
am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449': extend timeout to allow for more time for the device to connect.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions