diff options
| author | John Wang <johnwang@google.com> | 2011-06-09 11:56:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 11:56:28 -0700 |
| commit | 474c60cc38fb754076ff17812fd29049002a1980 (patch) | |
| tree | c8c0374f32a2f32425bd530840094070deb0e364 /tools/aidl/generate_java.cpp | |
| parent | 9429e6ebe427e1bde01391d53f323ec33d540a14 (diff) | |
| parent | 1861225be3c848fdf395f7aa815c673af4239011 (diff) | |
am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.
* commit '1861225be3c848fdf395f7aa815c673af4239011':
Do not merge. Return null id for Non-phone device.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions