Reconcile with klp-release - do not merge

Change-Id: I427a690248ab49aca987347b18f08ec0aabe38b9
This commit is contained in:
The Android Open Source Project 2013-08-14 14:10:28 -07:00
commit 243ae9f461

Diff Content Not Available