tree 4dbaa9b2b013881242590787d8f93809212dbf3f
parent 46bb133789557a6571451b153574d3fb801219b5
parent d9657b223068d1c96aef1ebc12bda6ecab6ad694
author Clay Murphy <claym@google.com> 1392246184 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392246184 +0000

am d9657b22: am bb778ebe: am 7b6008a0: am eeb15ca9: Docs: Adding information for temp and setDelay Bug: 10134622

* commit 'd9657b223068d1c96aef1ebc12bda6ecab6ad694':