| commit | 6217f3f81ed52923cf04290df4c0496d1741c33a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:18 2013 -0700 |
| tree | 0d4b215a5c6da537535b6e9fd66eb14d0932c76b | |
| parent | 1a3ee2b8928fe69d13bdfb980ac1c7994ff0d334 [diff] | |
| parent | d5a63fb6d763551b31f0dd9563ccc17e4652094b [diff] |
am d5a63fb6: am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd5a63fb6d763551b31f0dd9563ccc17e4652094b':