| commit | d21e0f9ac595040bdec429d68094c6bacb4bced3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:14 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:14 2012 -0800 |
| tree | b012d7678c9ba215c95a9c3b7b116efa3cc8d13f | |
| parent | 849137b6ff087ffbe7bb33c400eef98c5d78b743 [diff] | |
| parent | 2db11b66e13fdb5398529d9376998d4ee4f60e5b [diff] |
am 2db11b66: (-s ours) am 92c5ddcb: am baf8ef51: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '2db11b66e13fdb5398529d9376998d4ee4f60e5b':