tree aa51be60d87698511d570903783f350517de6dd9
parent b7f82c7c4022a885314cce3a34d9d94dd3186b89
parent 292ff27d4b505634e14d492972fadb28e9fc2040
author The Android Open Source Project <initial-contribution@android.com> 1340115361 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340115362 -0700

Reconcile with jb-release

Change-Id: Id1dce27a5a2dc5fd8af5cafd7501d59f54614df3