tree acfc8b558580f0421840af5f9e94b328e18c1a90
parent b7c14d3c7a9df13f3e37db90ccf89cf713fd09f5
parent b43774ad8fe7855acb2b23837003b44cebabdc73
author The Android Open Source Project <initial-contribution@android.com> 1351700223 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351700223 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Id17039f77e0e3a14fcca640bdeb65b24640b14b0