tree 94c810fb99bcb7cd06610ef36d4d4e3c88bf0166
parent f5b27f714063361d07a7ca6f107bba3e13b75d38
parent 8b4053a1aa0de3266ab6e23022d14265b54d2afa
parent a58b6a4bcd0c2877694fc0800852ab58f2e78604
author The Android Open Source Project <initial-contribution@android.com> 1350052260 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1350052261 -0700

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad