diff options
author | Xavier Ducrohet <xav@android.com> | 2011-05-23 09:52:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 09:52:52 -0700 |
commit | 041fd74beade4e95cff6157af9dadbf9a99b7fcf (patch) | |
tree | 859be7bdb276321a9bc76e04b82e98c984533f6f /tools/aidl/generate_java.cpp | |
parent | 9d9a7466cd051748ba656acd39265099294c4153 (diff) | |
parent | f791863f0ac67ab6abd7410d5807d716cffc5b72 (diff) |
am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
Merge 05b7b69c from honeycomb-mr1. do not merge.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions