tree 73307f9abea09f26a22ed175776fc0c83111a873
parent 23a8d1eece2a61d3f3b9fe2655aca860ee794a55
parent b7f82c7c4022a885314cce3a34d9d94dd3186b89
author The Android Open Source Project <initial-contribution@android.com> 1340111777 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340111777 -0700

am b7f82c7c: Reconcile with jb-release

* commit 'b7f82c7c4022a885314cce3a34d9d94dd3186b89':