tree 078917028e2c0fa70394e9444733a1c6d4c253cc
parent 3a25b14bdb09880994abd991d16080023dc97ad0
parent e9a10effdc304c977530a2430e868eda6ac74a9f
parent d479e9ec2ee93137469ced269fc0e343a4f6be73
author The Android Open Source Project <initial-contribution@android.com> 1339080686 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339080686 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I21de3186d1a880575b7309675845e6b382c5882c