| commit | c2122610bb5cb6054a1956cd356c4cb69811357e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:20:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 05 08:20:56 2012 -0700 |
| tree | b8b897772d352ebb7ced2f63602840d9b3e38208 | |
| parent | b3ef79b6cc80019bb6ac41b1990fcb971b77488e [diff] | |
| parent | eca0b552dd93a3e24fe90f6e0cc014e808daffb8 [diff] |
am eca0b552: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'eca0b552dd93a3e24fe90f6e0cc014e808daffb8':