tree 631adf301ff844b712f7f645fd6525a67ee316b0
parent 0adb3eb8a13f19b199b241a07954220cd9d3d586
parent b06791667c60296040734cb4ec2c01ed38edf62a
author The Android Open Source Project <initial-contribution@android.com> 1338398526 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338398526 -0700

am b0679166: Reconcile with jb-release

* commit 'b06791667c60296040734cb4ec2c01ed38edf62a':