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