tree fb7a66dd1e6cea9e1d4262ba66d835b41e3b9f53
parent a2a1ce823b8c76451ee2b38155b347b0c2ced714
parent c287321e9c8dbe92bd8d5081487fb2eea7680ac3
author The Android Automerger <android-build@google.com> 1380805282 -0700
committer The Android Automerger <android-build@google.com> 1380805282 -0700

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