tree fc5603af916a4100ff58dea6eb806dfab83e601a
parent 7e9e5e20f0d03647f7a115e76b921dd08fddde3f
parent e9d8fa394a3df291b4f36a3c0a70f3c91448fac3
author The Android Open Source Project <initial-contribution@android.com> 1339431761 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339431761 -0700

Reconcile with jb-release

Change-Id: I0d94ab9864f2742cd8647643f3acf7cdb4e770c7