| commit | 936293380db50e10b721e693ec6b8919c435e57f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:27:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:27:43 2013 -0700 |
| tree | 7ec848fea8c09823a9734d3907e5cb13aaa412c4 | |
| parent | 3673e0c9347e3f312261ef161a3a8cdebca3553e [diff] | |
| parent | 12641e93cd1c3b3f5c5dfa4962f3e3b685eca226 [diff] |
am 12641e93: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '12641e93cd1c3b3f5c5dfa4962f3e3b685eca226':