tree 8b6df84a0eb753d67b136507dfd0029c24769e55
parent 872e7db64eb4ac56040dcefea5b1bfa8f68253aa
parent e384980bbfc1a028763d728716ecf960fe3bf440
parent e384980bbfc1a028763d728716ecf960fe3bf440
author The Android Open Source Project <initial-contribution@android.com> 1337182842 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182842 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I565a757a5f9b37f075d53a446c915506ceef0074