| commit | 1d9e1671e0ff4e27ed57951365bff456cbdc4a90 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:36 2013 -0700 |
| tree | c8667229f4db3246eb4fa8f13bc537e24703a1bf | |
| parent | 6d47579d78a1c731aaeb8f3682ddf557952f186f [diff] | |
| parent | e5af08991772aa8028d55329e335eab89c22e684 [diff] |
am e5af0899: am f31bca4f: (-s ours) am 2d9e4e9f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e5af08991772aa8028d55329e335eab89c22e684':