| commit | 73ec847def855a7de7ea29b2a9034752cf702936 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 21:12:38 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 21:12:38 2013 +0000 |
| tree | 6d9742bd92769ff3760a727a8df440ba31e27af6 | |
| parent | d16a3702937ad91183b36564d1b73a62e8276749 [diff] | |
| parent | 4446f9fcc05dfc12cf030ed330ea62f2cbfb2180 [diff] |
am 4446f9fc: am 5ecd99a7: am d7ee1e53: (-s ours) am 60998d47: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4446f9fcc05dfc12cf030ed330ea62f2cbfb2180':