| commit | 9576bbd3ebe93050c32c21e928dcf23ccc9c97ca | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:22:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:22:59 2013 -0700 |
| tree | 34049eab3dcc3b498de99ec186881bbaff483824 | |
| parent | e0c8f22188026985f304bc28da6fb41d3bffb517 [diff] | |
| parent | 810a72954efcd36cf55c70e251c3c7a0c2c15b62 [diff] |
am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '810a72954efcd36cf55c70e251c3c7a0c2c15b62':