commit | 2a29e4ae54a8f5db589b32412abf77fd62a5790a | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Fri Jun 10 15:23:55 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 10 15:23:55 2011 -0700 |
tree | c1ea82531bdd7cc05ae2d10b7bd7c86bf2b610de | |
parent | 8d828fc4492ea9a828f64ec4696769600aeb4718 [diff] | |
parent | 89dfebe7afdb412444e238044c72e6acf8fae577 [diff] |
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)