diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-21 21:35:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-21 21:35:38 -0700 |
| commit | 8508485871dd22a998db98ea97403126918c5fa8 (patch) | |
| tree | 7888830d02350d6703d3046ea3a068f89ef7fa7c /tools/aidl/generate_java.cpp | |
| parent | 5710e72d91f16f34998ceccdd961ef9dc9e3cdb6 (diff) | |
| parent | 5a6bec53e224b2db9ecbc6920faab08f4a962256 (diff) | |
am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
* commit '5a6bec53e224b2db9ecbc6920faab08f4a962256':
Simplfy getActive* calls in ConnectivityService
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions