tree eb1d987c796202ab3d7af4aa163a8e494e0fb39e
parent 1a91a4cdcaf380f8088c7692d43e3deef2dacbc7
parent 2699d8712596f050bab081bf637375ef3cda4951
author The Android Open Source Project <initial-contribution@android.com> 1370293400 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370293400 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: If4df437d46af4b05beeb9fc08882d4cb8e94b198