| commit | 874cfec17ff584daa0e7bb1cab050c2a379cd675 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 22 22:45:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:45:59 2014 +0000 |
| tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
| parent | 7263c245f7fe8ac8edfe03e1c246fb539569e5c7 [diff] | |
| parent | c0be4c4bd70e18eb7ee05e83288ce6bd91beeb66 [diff] |
am c0be4c4b: (-s ours) am a58675af: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'c0be4c4bd70e18eb7ee05e83288ce6bd91beeb66':