| commit | 43b912989f6cddca820e98ff29dcedf83a89ddde | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:29:14 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 13:29:14 2012 -0800 |
| tree | 4175e58fbcdd59317ca158991b912bade286d42e | |
| parent | 5d0f94aa25d5e72fccd3b0d3ed3ecd4855b0e963 [diff] | |
| parent | 34d12aaf7ab9162fe891458d45a130e93e9cbc34 [diff] |
am 34d12aaf: Reconcile with jb-mr1-release - do not merge * commit '34d12aaf7ab9162fe891458d45a130e93e9cbc34': JOP37