tree 1bc6c1c061163d216f1ae6fc4e7218dbfe062064
parent 504dccec97c12283f348838ba0bf88536322ee6b
parent 29f26a8dc7169b040d5aed28c7e1ee94fb8f6b5a
author The Android Open Source Project <initial-contribution@android.com> 1340111638 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340111638 -0700

Reconcile with jb-release

Change-Id: If15d22c16a727b5a57edb82572fef50bab8f28a3