| commit | bc38c07e6c2aa354d546ad05fdee3c309e14698f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 14 08:35:52 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 14 08:35:52 2013 -0700 |
| tree | e7d258362b73c2de05bf9a29667bdf1f67935f5f | |
| parent | e7245147579bd8eb3780619183854e39bd3b4e77 [diff] | |
| parent | c21100fe1f1e3bc9d17dd378d78b71592e619d4a [diff] |
am c21100fe: am b0ddf9b5: (-s ours) am be482d96: (-s ours) am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c21100fe1f1e3bc9d17dd378d78b71592e619d4a':