tree f4a2baa04ef59804af24f9697c6c30a8ef37a7d9
parent ad7fd29b312bf588b2be3f799715f34ff8a6d46b
parent 17a989f7d690363605b32e439a836dbc0cdb6462
author The Android Automerger <android-build@google.com> 1376398855 -0700
committer The Android Automerger <android-build@google.com> 1376398855 -0700

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