diff options
| author | Victoria Lease <violets@google.com> | 2012-10-30 13:31:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-30 13:31:44 -0700 |
| commit | 517303e05b9a9246c8aab53574d768eb52c88e7e (patch) | |
| tree | 77891ec447599dbc3191fc47d1955365582ee0b7 /tools/aidl/generate_java.cpp | |
| parent | 95ba9e8ba3a55504e3b83dbdfb3bcc23de093591 (diff) | |
| parent | ac14efce4b9575ac1de567073d7088162d4d2eed (diff) | |
am ac14efce: Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
* commit 'ac14efce4b9575ac1de567073d7088162d4d2eed':
DO NOT MERGE suggest LocationRequest rather than Criteria
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions