am 89dfebe7: (-s ours) am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE)

* commit '89dfebe7afdb412444e238044c72e6acf8fae577':
  Fix "Show settings key" option on 7" device (DO NOT MERGE)
This commit is contained in:
Tadashi G. Takaoka 2011-06-10 15:23:55 -07:00 committed by Android Git Automerger
commit 2a29e4ae54

Diff content is not available