| commit | 9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:42:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:42:01 2013 -0700 |
| tree | 260be3ae7acecccb7ddf72a06a913149ee41661c | |
| parent | a374d81605f4ba760db9613dd8aa8d8a0370dab8 [diff] | |
| parent | f4b1aefbaafba7ba290a05bce84f77ee5ad5b043 [diff] |
am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':