diff options
author | David 'Digit' Turner <digit@google.com> | 2011-07-13 14:55:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-13 14:55:20 -0700 |
commit | bd55ab18775d119596a3c1cfad4c1e541d23ca64 (patch) | |
tree | c2830bdd4beac8b68f0a178baae7e79aa12c1dac /tools/aidl/generate_java.cpp | |
parent | 605a80f3c3c77fefc6bcfdfd7b22f2839a76c7af (diff) | |
parent | 0814a9aa0c8f89f084ba37df05b3735274d78420 (diff) |
am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
* commit '0814a9aa0c8f89f084ba37df05b3735274d78420':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions