| commit | e973d114352824b6bbce6e5e70cb2e5e7059b898 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:06:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 15:06:12 2012 -0700 |
| tree | 7ddaeb531481e3190257f2a60b4ac494dbce1a86 | |
| parent | b8f4bb072bde70aac3a7bd7c734369bc4710989b [diff] | |
| parent | 71d93f3947eb6145ddb70289da7bf164f769ffb6 [diff] |
am 71d93f39: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '71d93f3947eb6145ddb70289da7bf164f769ffb6':