tree 94cdcf5bdfb8d552d2c038a8b3d18f68e2f6417c
parent fc8a1048438e4744e193a65d95bcb0bf73bfa2a8
parent 99ca798f07e70442ca525ef4861df46994037543
parent 99ca798f07e70442ca525ef4861df46994037543
author The Android Open Source Project <initial-contribution@android.com> 1337182850 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182850 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I35babf45d3dff40fa4b98150a7b76937a23b8f52