tree bec7b8cc00bcb1f54b98aab96b7ac39ad0e962d6
parent 7d816a7d2f350957bd15b370aa65e35fa50b7f44
parent 407e9e7fc6030d48e656365de28eb01196d41d85
parent 91d75c8bc3658ee728a1d5a2c6c740c1b68742ba
author The Android Open Source Project <initial-contribution@android.com> 1337182862 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182862 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I7c8a07aa1820a4a95030299c0d9c8fefbec98ea3