summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-04 07:49:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-04 07:49:46 -0700
commitcb27b906d20972361ef15a308a1d1546ecfb4dc3 (patch)
tree9ebc5c60f194ec67946aabf4779ad5aa36d555fa
parent8ff20482cac4c76aa1bd55f5023d444485ff9635 (diff)
parent4c9dbbf9378b70c4011817eb1f8696c43f05b4b0 (diff)
downloadandroid_frameworks_ex-cb27b906d20972361ef15a308a1d1546ecfb4dc3.tar.gz
android_frameworks_ex-cb27b906d20972361ef15a308a1d1546ecfb4dc3.tar.bz2
android_frameworks_ex-cb27b906d20972361ef15a308a1d1546ecfb4dc3.zip
am 4c9dbbf9: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '4c9dbbf9378b70c4011817eb1f8696c43f05b4b0':
0 files changed, 0 insertions, 0 deletions