tree adc74502969799df50ba6f1000d9346c8bbf1df8
parent e0cec46397b1387dfa23f864c06a8e503fff5b1b
parent 45daca0252d426638cc41e53a44c69a4ba4b60eb
author The Android Automerger <android-build@android.com> 1330614023 -0800
committer The Android Automerger <android-build@android.com> 1330614023 -0800

merge in jb-release history after reset to master