| commit | 240f37715ec6eeeeca9b857cbbcf3a9e3037b17a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 16:29:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 16:29:03 2013 -0700 |
| tree | 28e3e65a06ff331f2c75bc1dc1524e012173641a | |
| parent | 8ae5c7b6f98a5bdb7d7d1908935030aa88d89e1e [diff] | |
| parent | 86dea47ba8c4c5edcefa06cd730aaed20c29b920 [diff] |
am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '86dea47ba8c4c5edcefa06cd730aaed20c29b920':