tree f90a37b45223f0bf3d068d48d35574f6c5f956f3
parent 3c68bdb26643eacbb411759799f6fcfb934c34eb
parent be01b2edb9da0a684d69d0af5e77b0fa96ff848f
parent 709da47291115a2e9a963af21691a0141d5eef41
author The Android Open Source Project <initial-contribution@android.com> 1337875296 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337875296 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I8413b3bf0524dbfee9b1d5201774e2e519e56cf8