tree da7ff387625c6ee98d6232d5b94c2f755ec01711
parent 143dc769ef9709f0e65cda85f2ff6375c69560c8
parent 2c1ef5328cee7059b1ab0d8de849c2fa474f88dd
author Joe Fernandez <joefernandez@google.com> 1411595648 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411595648 +0000

am 2c1ef532: am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs

* commit '2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher