summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:31:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 12:31:12 -0800
commit770dd86a758807fc656ff07c4696a273c2283d8f (patch)
tree817f745f708fee6cf24ef68e8f183872427531a0 /adb
parentd249cddca6408c5fe2b02c1bbf094f050c5fda57 (diff)
parent63766a89a18e8476f6e4cbac505a2a827d0490ab (diff)
downloadsystem_core-770dd86a758807fc656ff07c4696a273c2283d8f.zip
system_core-770dd86a758807fc656ff07c4696a273c2283d8f.tar.gz
system_core-770dd86a758807fc656ff07c4696a273c2283d8f.tar.bz2
am 63766a89: (-s ours) am b64246ae: am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '63766a89a18e8476f6e4cbac505a2a827d0490ab':
Diffstat (limited to 'adb')
0 files changed, 0 insertions, 0 deletions