diff options
author | Xavier Ducrohet <xav@android.com> | 2011-07-11 12:46:07 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-11 12:46:07 -0700 |
commit | 9163a4a686fc25fefc77d5b41c24a4538486a48e (patch) | |
tree | 5ceb5620392bb3ffa4072e5899cb8a95a2a318d0 /tools/aidl/generate_java.cpp | |
parent | 3b219a51a9d692807d3fb0f516df81609ca6e4fc (diff) | |
parent | aa4b1d8ba9d5e317b67638b764d92d17fb810aa0 (diff) |
am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
Merge 36a3a392 from mr1.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions