tree acfc8b558580f0421840af5f9e94b328e18c1a90
parent 4c80e1addeee093e0b9e7ad6f918cdcda92f6c3b
parent 3d96c16eecef321ee20d749804e4b4a6f87326d9
parent b43774ad8fe7855acb2b23837003b44cebabdc73
author The Android Open Source Project <initial-contribution@android.com> 1352233043 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233043 -0800

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

Change-Id: I87313b00fc7435d079f0270cf0140dd57436e67a