| commit | 34cc8273f15927d5daeed87990695dae8f296b07 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 22 22:46:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:46:03 2014 +0000 |
| tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
| parent | 2ca7ca78b81baf411c13fdddf510cdf3eb36bd4f [diff] | |
| parent | 5bdedcac132c362744c8cc8ef588d19bf0763479 [diff] |
am 5bdedcac: (-s ours) am 1b826fe7: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '5bdedcac132c362744c8cc8ef588d19bf0763479':