tree fb62c151d14f375bb2a1963fa5b20425b415a460
parent 6e6819f7b8b4820ae2b1003a516fe9aa60fa478e
parent 56077535accb6bcfedc8f6e54459453eb081b83d
author The Android Open Source Project <initial-contribution@android.com> 1376514086 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1376514086 -0700

Reconcile with klp-release - do not merge

Change-Id: I4ba33cf9c61be55244f3802734a9ca715c2c0c44