tree 4c463bb50e3ab5fd3f3fcc2fd8f3a88cfb4f7025
parent 54280bae234758eee9acea651e739620cec9af8f
parent d51b61e16e699a4ed29644d5d58c98e652b3e403
author Guang Zhu <guangzhu@google.com> 1274233058 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274233058 -0700

am dad33bbd: (-s ours) am 97f8b171: Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken