tree 6b413911333186f92c30ac31bf198d11ce951d9f
parent 511eaf802a6e7599ec43843baf0b6348b3cc3bed
parent c337d8660a5bcf97f4ec046903cdcfe997a8a4a8
author The Android Open Source Project <initial-contribution@android.com> 1376518217 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1376518218 -0700

Reconcile with klp-release - do not merge

Change-Id: I11d427fe49ec6cb012b0176734dc245eabd5f50b