tree b39a4f67497c0529efe9876bf138762dc1dd9eb7
parent 085888a1a4ce272966ac18a6e67b00c948ca33b1
parent bf274b90b041e59a559f90abb5124c8218b0ce99
author The Android Open Source Project <initial-contribution@android.com> 1337717210 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337717210 -0700

Reconcile with jb-release

Change-Id: I71c3f35d846f61dcded1e4fb5ec2eec81da805e4