commit | 095623bbf9d7b85d182944bb7b0f6430a30bbae0 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 14 12:37:53 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 14 12:37:53 2013 -0700 |
tree | 4ed8315d834e80e0a232d98201893099c25a321f | |
parent | d89c234c749386a4dc6e362e719cb230853f18e4 [diff] | |
parent | f85f4a21f9a5691f6248b41237031325465c5895 [diff] |
am f85f4a21: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f85f4a21f9a5691f6248b41237031325465c5895': Fix Vine crash.