tree b69dc671e0cfc5a7076cf4220291e65ca977cab5
parent e83b7cf8f1bad5b334b6352d3b850d8555530a9a
parent 336a9949c47eaead7cbedec118dd15e84e26f523
author Doug Zongker <dougz@android.com> 1326924161 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1326924161 -0800

Merge "allow recovery UI to ignore certain keypresses" into ics-aah