commit | c39bcb00a3c791998163e9f1d4d72fccdf48ca3e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:18:46 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:18:46 2012 -0700 |
tree | 3ed3a4f6b18a5ae47f55ab4b124a6104ac670b3c | |
parent | d377572797492ee0d87876a37fa0065b5d3626a1 [diff] | |
parent | a3103f9fe060e91fd6de0975ebe31ddeed88a9e4 [diff] |
am a3103f9f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a3103f9fe060e91fd6de0975ebe31ddeed88a9e4':