| commit | 180535015dde279981cd32986a9b789d54b88282 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 10:17:04 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 10:17:04 2013 -0700 |
| tree | dacda19d3869843eba29e24e7f07a1b3f8c2918e | |
| parent | a7ac8be1f564ad27c0b1f4796b60f3eaaa8dc611 [diff] | |
| parent | f51538f444ca9448d194cf184af4fd8f0554d723 [diff] |
am f51538f4: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f51538f444ca9448d194cf184af4fd8f0554d723': Revert "Stop marking gamepads as keyboards" Revert "Temporarily disable 'Scan Always' mode"