| commit | 9983e817b20980afd321739d80f99164a6b79bb0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Feb 27 06:26:30 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 27 06:26:30 2013 +0000 |
| tree | adfa8dcf5c4baa229f9a0d8beccce3c49853372a | |
| parent | 62cbc78e318cb18ff07b02fca0e847de3addf041 [diff] | |
| parent | ca84938689028a7c5f5747d81b81cfc6a6c1b382 [diff] |
am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ca84938689028a7c5f5747d81b81cfc6a6c1b382':