tree 86e632c084f288d77cc8d41aec5546672b2c738d
parent 3e417cfad12cbf84bd2779e44f28d45705b35f2e
parent 9aae69c63423b9dc235516c60ee00bf4a322073c
author The Android Open Source Project <initial-contribution@android.com> 1337875462 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337875462 -0700

am 9aae69c6: Reconcile with nakasi-factoryrom-release

* commit '9aae69c63423b9dc235516c60ee00bf4a322073c':