| commit | c6e029281d6a2a12bcb0f8b9e8feaa87e477a871 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:19 2013 -0700 |
| tree | 15dc556b476a35dce773383d320c4b5ee21a5080 | |
| parent | b2e974b1c14bb46ad49e743f63a65d8f259bb5ca [diff] | |
| parent | dedef1e4987b0dbfbe5e089b306b5ab8022bd02b [diff] |
am dedef1e4: am 613541b2: am 4a7ec0f3: am 8efbf9e5: (-s ours) am 53e16ebc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'dedef1e4987b0dbfbe5e089b306b5ab8022bd02b':
