tree 41ab057f2d788b41215d1deb9f2b75b23b9059c5
parent beb7b1b4b95b1762b507eb2a9c6380e24c8b7a62
parent 83eb691b5ea37756cabb1c33a138a3d2701a316c
parent f3a38594c8a459c7f70d7a62a56f128bc85873b5
author The Android Open Source Project <initial-contribution@android.com> 1337391841 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337391841 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Id94f334e6a92cf48ac774f1f4233df95d9241274