tree 8f165c37e7d30534b36be6c5caaba250fb5d3345
parent 4c4aacafd15c59ce92786144a892fd90c8897b70
parent a75f1b20187b591f9d65642543ecbb2858d19bb9
parent 49213977ff01baa5783754071f810bd070961b3f
author The Android Open Source Project <initial-contribution@android.com> 1338309678 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338309678 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: If959f96550e42768469ecd2f54ba60ba62140ca9