Reconcile with klp-release - do not merge

Change-Id: I104b4a186af085b6a7a5f7d64f4dbb3dfd5aeb01
This commit is contained in:
The Android Open Source Project 2013-08-14 15:10:28 -07:00
commit 8bf4e52cdf

Diff Content Not Available