| commit | 27b943ed286420531b17d5f4ed8ee73d121817b6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:48:54 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:48:54 2013 -0800 |
| tree | be86b765640bb6adb594d0e03484eb535665fec1 | |
| parent | 952ab8d6ff86939d0410e846082a871c200dafb1 [diff] | |
| parent | 0bd469895e7fba3855c2da262b3ba0f7205c4cce [diff] |
am 0bd46989: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (2) and The Android Open Source Project (1) * commit '0bd469895e7fba3855c2da262b3ba0f7205c4cce':