tree 50e800fcc4d4d24907154f32db77561b1f6a3dfa
parent e4cd4512d684c23a31fbb91c65e2283d7c16d415
parent 75d2a79001bb4fb072f8934f7774a25aec24cc23
author The Android Open Source Project <initial-contribution@android.com> 1337875313 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337875313 -0700

Reconcile with jb-release

Change-Id: I76ffcc7449cf140d5598612a6be3e8f7b964dc9b