| commit | 8aef3c00efd0c1290abe9ae05feb92e9ef8e4660 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Tue Sep 09 00:26:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 00:26:28 2014 +0000 |
| tree | 555f8dd8288010cfb5d44338b115c65c2149e0d1 | |
| parent | 0238fff665134d2174a8507fa0fe6cc05f928f3c [diff] | |
| parent | d4241d49d6cfdc49df4e16165b9d09659651d87a [diff] |
am 11fb85ef: am 1c5d160b: Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev * commit '11fb85efb5976386054194ad2b723b8f63154c01': Add FEATURE_GAMEPAD to current.txt