diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-04 13:20:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 13:20:36 -0800 |
| commit | 55a7a85f21822f6d8c06f0d68de5831c55ef9975 (patch) | |
| tree | 548d92792434a00cf0cffbda34bfd3be2b042e55 /tools/aidl/generate_java.cpp | |
| parent | 367a8c59e505458ba17a1b7442bdad0b06b8fe20 (diff) | |
| parent | 6526382f568214e1a5f2245f3627feb714b94797 (diff) | |
am 6526382f: am 86f96215: am 29c40abf: am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '6526382f568214e1a5f2245f3627feb714b94797':
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions