commit | 908f28e72902d14da5847735b7e3bcdd912d9948 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 22 22:46:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:46:00 2014 +0000 |
tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
parent | 874cfec17ff584daa0e7bb1cab050c2a379cd675 [diff] | |
parent | e7a370faf5c6cf9663218c98613eb1c018b63c58 [diff] |
am e7a370fa: (-s ours) am 55cb9a03: (-s ours) Merge "Reconcile with AOSP - do not merge" into jb-mr1-dev-plus-aosp * commit 'e7a370faf5c6cf9663218c98613eb1c018b63c58': mako: prebuilt kernel