| commit | 72b2575effe57fd99d4dd0eb665daa0f89eef912 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:23:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:23:35 2012 -0700 |
| tree | 90985f7e71e2f63de333c69480f43252959c4f2e | |
| parent | 0f929c09897e61161b92548b9c2f30a165973e3f [diff] | |
| parent | 6dd8880cc9efb5c1152717cc2dead62c7d3adcb8 [diff] |
am 6dd8880c: (-s ours) Reconcile with jb-dev - do not merge * commit '6dd8880cc9efb5c1152717cc2dead62c7d3adcb8':