tree 0cbda4638dc30b851baec16f1b84f3dbd5cd6977
parent a4d57eab27139af93ecdb4b0eb8ec8c5193b7c80
parent 39865ff7edb776634ad054884a6184a26ad2f4b0
author The Android Open Source Project <initial-contribution@android.com> 1341445716 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1341445716 -0700

Reconcile with jb-release

Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da