| commit | 38a822ea204444a97cbcd785953af1154cde020c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 22 22:46:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:46:08 2014 +0000 |
| tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
| parent | a0e9273c3a64634451262a1b5a3c09ed75cc0f6c [diff] | |
| parent | aa89987c94b4266931b48d4fdf8701c3ae2dc0bf [diff] |
am aa89987c: (-s ours) am 748b4593: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'aa89987c94b4266931b48d4fdf8701c3ae2dc0bf':