| commit | c183bb9137799d65a2a13865eca8d06f4046a75d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:11:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:11:35 2012 -0700 |
| tree | 9f7aed51a2765a672a1fa8862dd56d67ff63f8e9 | |
| parent | 30fbe72cf708e2cec2489d039735e1ecd43bec36 [diff] | |
| parent | eaa4a626a91759066c707df84607c6ddfc458693 [diff] |
am eaa4a626: (-s ours) Reconcile with jb-release - do not merge * commit 'eaa4a626a91759066c707df84607c6ddfc458693':