summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-06-07 15:56:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-07 15:56:19 -0700
commit229d3a0cbce70db82003705abf6844deec136d20 (patch)
tree99b98b041cf9e9455afe9da993f2a841cf8eb81e /tools/aidl/generate_java.cpp
parent816e5b72190787f2b6136925c172a00ebcbe4077 (diff)
parentfc94d45fc209dbcfdf7f57e0c04c581e1e51988b (diff)
am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b': Make getDeviceId return null for Non-phone device.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions