| commit | a8e431460440e42ae7d815c7e5a98703885cc557 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 20 15:50:06 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 20 15:50:06 2012 -0800 |
| tree | b0f667981ddf732813c33bc7ecf39d0ba49793c6 | |
| parent | 0925131933e25a4e0004b3eefc05be65348dc947 [diff] | |
| parent | ac0fd124133b04f555047df8804ecc46ef3751e9 [diff] |
am ac0fd124: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'ac0fd124133b04f555047df8804ecc46ef3751e9':