tree 696d3b301f005759c8a39a1e0e4ab64d6076ff8a
parent b8b31bfdcaae3502d8d12b5d1f743f9c268ec282
parent d62bf8fb254b3f27c0170c5d96424ae93afce5ad
author The Android Open Source Project <initial-contribution@android.com> 1341019990 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341019990 -0700

am d62bf8fb: Reconcile with jb-release

* commit 'd62bf8fb254b3f27c0170c5d96424ae93afce5ad':