| commit | 071876924fa6f3f83d7b606687e0184c47a5716b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:40 2013 -0700 |
| tree | d8c3067833c9a03bfc8394fff17a1e51126ef837 | |
| parent | 1a42587d775c6dc8df4f40c960d866376150b0d7 [diff] | |
| parent | 40e8ada0298ab2b57a170b7bcc37eb4c05eb3db7 [diff] |
am 40e8ada0: am cbec21ad: am f0f706bc: am dda70146: (-s ours) am 77a62c8b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '40e8ada0298ab2b57a170b7bcc37eb4c05eb3db7':