tree 980415a874ad1f6711cd81bf647df6477b2d632d
parent 7916e624bd0f084b945ec39dd258057ed8e5dd6f
parent 00e84851d14edfaac9cb732193aac0d3e5ef2da7
author The Android Open Source Project <initial-contribution@android.com> 1347722487 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1347722487 -0700

Reconcile with jb-nakasig-release - do not merge

Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c