tree 0afa7d4bca2d1042f1cf3085c121967de2a92815
parent 42afb5457f75cffb29a6d658fbf17961210080fd
parent cda00bba51c6adbf95e451fd8c6cad7a5390503a
author The Android Open Source Project <initial-contribution@android.com> 1348162491 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348162491 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba