tree d6de1c5db3e55785c61214d78d22ef47d0f907df
parent fe2d34a89e836d111b9f68f0801431d3c2aec132
parent 77dff41d780ce6f9b6e2df335f4b61d476d7bbac
author Christopher Tate <ctate@google.com> 1331003468 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1331003468 -0800

Merge "Add a config resource to disable key-chord screenshotting" into ics-aah