| commit | fb899d85ee3497dbb9443fbbee0241aaf94f2e52 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 19:35:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 10 19:35:45 2013 -0700 |
| tree | 07f375c2026f5d618b0cef50fbc5198bf14f6a5a | |
| parent | 4c896a2fe81748990786288eff28b00233423da9 [diff] | |
| parent | 3019a5e1d11eca0d9a8396cf6684f72767eb6d6e [diff] |
am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge * commit '3019a5e1d11eca0d9a8396cf6684f72767eb6d6e':