| commit | eb0df7475b03fc0f3a26e6e7976cfc34fd3ae18f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:23 2013 -0700 |
| tree | 3356e4c635f6913d10fbc857cefcbd63d8702ffd | |
| parent | 4c3f8b38a1777ae6f97bac8bb62897346d851c00 [diff] | |
| parent | c3879c0b80ea39a5f7e9ee0770c9729a1d550c56 [diff] |
am c3879c0b: am c33bb3e4: (-s ours) am 675c10a9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c3879c0b80ea39a5f7e9ee0770c9729a1d550c56':