commit | 2219bd26bde084d4703cab9bb85982e41ad01f28 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 12 07:40:56 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 12 07:40:56 2012 -0700 |
tree | 6218316845ad145937fc082f7e16405f9fa7f665 | |
parent | 7a083b69466d207a427d77d6d84b1b7406849185 [diff] | |
parent | 5c9b0b26c76c5bf1526d578a8c21b30884e87c5b [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I17f75cece44e1e9dfe9707346ee7168ca0f0a654