tree 5855bb5463c58f978e026d3f94029c4a9810c28a
parent e0cc71fa19706dee06b1ef17dec720e420753162
parent 268f858be57089e568bc55aa9089af54a53dcc94
author Justin Koh <justinkoh@google.com> 1399331902 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399331902 +0000

am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev

* commit '268f858be57089e568bc55aa9089af54a53dcc94':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE