| commit | e72c590652848c79ccb6c7a45cfc9a710bac8bfb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 08:29:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 08:29:52 2012 -0700 |
| tree | 1970b4100048257cdfd0cf0c07fdcebe8fed1a54 | |
| parent | 184a59b9f818e42d18dfbe2c7f13c4f1ec58925f [diff] | |
| parent | 40bb0f390e36b1cd023bc32b24208bcfd7e82969 [diff] |
am 40bb0f39: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '40bb0f390e36b1cd023bc32b24208bcfd7e82969':