| commit | 724dd072e52f340240b814f643bd514558e3e65b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 04 11:29:23 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 04 11:29:23 2013 -0800 |
| tree | 9cfd52049db5b888a20d3573800b0169b52ca550 | |
| parent | fd398accb4e98f6c60b8445930fb9bf36bdd7df9 [diff] | |
| parent | 024f97c67b179894d7333cd7c68d9787f2d9382f [diff] |
am 024f97c6: am 825f29b1: Merge from jb-mr1.1-dev # Via Android Git Automerger (1) and Jean-Baptiste Queru (1) * commit '024f97c67b179894d7333cd7c68d9787f2d9382f':