| commit | c3879c0b80ea39a5f7e9ee0770c9729a1d550c56 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:56 2013 -0700 |
| tree | a04667a27b2b2a212cf6326179b9583355b53edb | |
| parent | 21fddc5f27b9d2841736a98a9f39e2651c50606d [diff] | |
| parent | c33bb3e4306f9f56558efff10eac1ba2810f9657 [diff] |
am c33bb3e4: (-s ours) am 675c10a9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c33bb3e4306f9f56558efff10eac1ba2810f9657':