| commit | e5af08991772aa8028d55329e335eab89c22e684 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:58 2013 -0700 |
| tree | c8667229f4db3246eb4fa8f13bc537e24703a1bf | |
| parent | 82bdbbfc31b27ac14f98d8375dbaa5dd1c0b8613 [diff] | |
| parent | f31bca4fe71621860791773daed21d768b6a902a [diff] |
am f31bca4f: (-s ours) am 2d9e4e9f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f31bca4fe71621860791773daed21d768b6a902a':