tree 331e1f27a051a2ea244f6b24e03f708d93b51520
parent 92008df16cfe5e959dd1f34f035c31b81dced92b
parent c31a0898275384a6c87f0c483ee1c8f357c78472
author The Android Open Source Project <initial-contribution@android.com> 1338309708 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338309708 -0700

am c31a0898: Reconcile with jb-release

* commit 'c31a0898275384a6c87f0c483ee1c8f357c78472':