tree 36b4be5944c86c1242d3a0444b537b7cc64d66b1
parent 25aa129fc1d808b678a2c0250ef12e1cabc6629e
parent 3dae9e4ab22003a1c6a79e80b4378df217b7fa7b
author The Android Automerger <android-build@android.com> 1332338467 -0700
committer The Android Automerger <android-build@android.com> 1332338467 -0700

merge in jb-release history after reset to master