| commit | 15c0ba91397c4f4ef32f27e35d83b40c303bff3c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:36:46 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 11:36:46 2012 -0800 |
| tree | 360d2cf9ec65fdc28ea1b5d65a12438ba8ade345 | |
| parent | 7e1820a7224c9b8726c1687924ff81dda20af5cc [diff] | |
| parent | afa8348248f9aa7cca59e1c74992fcd7ac6cbd90 [diff] |
am afa83482: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'afa8348248f9aa7cca59e1c74992fcd7ac6cbd90':