| commit | 800e4320ba0815bfe7831deab99f5d600800663f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 13 18:07:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 18:07:45 2013 -0700 |
| tree | 2a619fa3c494ff7911f9dcefc96f2beb6df136cd | |
| parent | 4b724cff027771d0d905809605b5cc50df220a4a [diff] | |
| parent | 63c34b5e2aae446b76fdf34f0ff895e35cd7376a [diff] |
am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '63c34b5e2aae446b76fdf34f0ff895e35cd7376a':