tree 739513134d371428f5606ba120f812da5992e4ad
parent 79392cbf67fd250e1bfa23f9abcb408ae69f6a69
parent 1e4dc2f08d5fcb048ad6c9fee576b0c0ea38cf8d
author The Android Automerger <android-build@google.com> 1378386051 -0700
committer The Android Automerger <android-build@google.com> 1378386051 -0700

merge in klp-release history after reset to klp-dev