| commit | e3c1094b0164bc5b01f42b80ebb80660f5651515 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sat Aug 25 07:18:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 25 07:18:43 2012 -0700 |
| tree | bf6866705d005ce3cde8128b9ca6f68aa8c906ef | |
| parent | cdd5447c1ed159afde002dc85c3542e685bdc6ba [diff] | |
| parent | 968db1dc85fcf0aec4636b5a7e8848ae27462ef9 [diff] |
am 968db1dc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '968db1dc85fcf0aec4636b5a7e8848ae27462ef9':