commit | 0102aa80c6af71aa6d643358b45a6688e06b929e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:27:29 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:27:29 2012 -0800 |
tree | b2bd63c2d6df7d340f1d088ae978b68b9e2d9356 | |
parent | 531df5ae8ac08d750fe9dd713de541191925bd0b [diff] | |
parent | 0fd6b1d1e2acf2ad5f35f83fcdbdb30f0e1c4eb5 [diff] |
am 0fd6b1d1: (-s ours) am 76572c63: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '0fd6b1d1e2acf2ad5f35f83fcdbdb30f0e1c4eb5':