tree 41ab057f2d788b41215d1deb9f2b75b23b9059c5
parent 67038a303747888714067d18745573b61206eb1d
parent e9d4edb9693d6fac148107eb0480c40a501ef6b8
author The Android Open Source Project <initial-contribution@android.com> 1337717213 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337717213 -0700

Reconcile with jb-release

Change-Id: I56d5e7da1f2c56109295f9fb6d836b4abd148ee4