commit | 27f31606390eeed50d27f2c243dfbfe79e8b5ae2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:21:06 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:21:06 2012 -0800 |
tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad | |
parent | cd74108cdac228e946ca8b6ea2ff11ab62941a6d [diff] | |
parent | aa0dbb25a0ae51a8e53018fe05bf59164d9804cb [diff] |
am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'aa0dbb25a0ae51a8e53018fe05bf59164d9804cb':