tree 351ba8238c80234f198ab8bd3d0f00e6c0741acd
parent 14b79c8e1f269400dc16fcbafc60e092e865ffc9
parent bb465da6b00259e4da760046a675d6bac276ea7e
author The Android Open Source Project <initial-contribution@android.com> 1337721664 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337721664 -0700

am bb465da6: Reconcile with jb-release

* commit 'bb465da6b00259e4da760046a675d6bac276ea7e':