diff options
author | Scott Main <smain@google.com> | 2011-06-28 21:02:05 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-28 21:02:05 -0700 |
commit | c2fdd15df93e62f9355af7ee3cbc9c116ce19991 (patch) | |
tree | eb30285ca3bcfd0d35a2694a14d7190dd6f8edc7 /tools/aidl/generate_java.cpp | |
parent | 6d18419a3c4a37213737d6372930b720b566b70e (diff) | |
parent | 846764e5aafc21d2bed9c7fde0b43e9548f96617 (diff) |
am 846764e5: am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
* commit '846764e5aafc21d2bed9c7fde0b43e9548f96617':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions