tree e9d6420a8f22f5127690fe79f0022ef055944a60
parent 1bfad87cacb38a2e1418de8019ccb775f8926f66
parent 2ce25523c47a5f6cc81e67906924bfbbb3ef0f02
author The Android Open Source Project <initial-contribution@android.com> 1345169423 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345169423 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I907688f075794f3eb2854421f6cae592e6982398