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