tree 76d4782d3579587a09723eb598e83abf228e5ba5
parent 1ad1b1d5ecd23c7fd1cd9d0e0f11439f14ced70c
parent 721f22119855d3c62ccac56acbb8599103d7e547
author Justin Koh <justinkoh@google.com> 1403213645 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403213645 +0000

am 721f2211: am 1305d4a6: Revert "Update 20.txt to match klp-mod-dev"

* commit '721f22119855d3c62ccac56acbb8599103d7e547':
  Revert "Update 20.txt to match klp-mod-dev"