tree 60082bb72704f8a7a087f6729342bbf1f2875e42
parent b9e9dcfa17a61a0cc2c192daae78d0af2927736a
parent 3fbf34f46a92bf75476fe79f0632717dc1ee74de
author The Android Automerger <android-build@android.com> 1332338510 -0700
committer The Android Automerger <android-build@android.com> 1332338510 -0700

merge in jb-release history after reset to master