| commit | eb137dc8d7a8695f1164052b63118793bf1d7b82 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:58 2013 -0700 |
| tree | 33a049c3d706dbd079cbc4ff78d0a50be75fb833 | |
| parent | 4c13e1cf4ac82d53093c99ecedf83fee738e8af8 [diff] | |
| parent | f92780b703f13af4c8379f23227f231ec125b229 [diff] |
am f92780b7: (-s ours) am b60c1ed9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f92780b703f13af4c8379f23227f231ec125b229':