diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-11 13:58:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-11 13:58:28 -0700 |
| commit | 2eb82513bd448757250dc8245e9c29c747397608 (patch) | |
| tree | ffe81460ca6a2f255d7cb6fe93a79fb0b081a72a /tools/aidl/generate_java.cpp | |
| parent | cccad2d8c2ea309a73b9408f8c36e7d964627570 (diff) | |
| parent | 9ba2a188919e6e5bf8c042b26527fc090de677ef (diff) | |
am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
* commit '9ba2a188919e6e5bf8c042b26527fc090de677ef':
Don't auto-discover peers until scan requested.
Use wfdInfo to filter available sinks.
Allow adb shell am display-size to use bigger sizes.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions