tree 8341c08c447a054c1193aecb8f7c19c8209cd9a3
parent 475b465e403db6b00c1ee3765262384874483b60
parent 41126829a32c6a59f602e99fee49f558a1aede8c
author The Android Open Source Project <initial-contribution@android.com> 1371085440 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371085441 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I61c2e7abaae34978e88c581f67e72bf45d4ebafb