tree 1a5baea26f86a7b4f9bff2df837de48e97aff312
parent a71f676b474ff78d69b1edc514fafea58919e5fb
parent de19a0c55d666e3e34dfffbcbfc5eab0d002e20b
author The Android Open Source Project <initial-contribution@android.com> 1376514628 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1376514628 -0700

Reconcile with klp-release - do not merge

Change-Id: I427a690248ab49aca987347b18f08ec0aabe38b9