| commit | 1fca2650edb5ae373a297b6029df5e250c021dd3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:23:57 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:23:57 2012 -0800 |
| tree | 15652db30bd69d6ee35210f48e65943767958003 | |
| parent | 6c249f7ae890694f061bfde7a3ab52bf367be110 [diff] | |
| parent | 27f31606390eeed50d27f2c243dfbfe79e8b5ae2 [diff] |
am 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '27f31606390eeed50d27f2c243dfbfe79e8b5ae2':