commit | 17a890729e430503c7a906073dbde570da34c377 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 14:03:22 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 14:03:22 2012 -0800 |
tree | c0f797169f548810bb57927c0e79afebcba7fa9a | |
parent | 3ffa3798786fc77a3b3fa905cd978688b827fead [diff] | |
parent | b70b69c417d8c6e83e528534173120765b1a62f7 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I5ffbdc1a3993d684898a61c818cfec1a8ff8ce4b