summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-10-03 15:19:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-03 15:19:06 -0700
commit06cf41b3aa46fc963d54196a0b3f4c0e09553d31 (patch)
tree9889be2beae66dbb104d0dd3eac32c096eae2f7b
parent07eb28f1a1ece6d14bb31ca5d797d5a8a1bbfac7 (diff)
parentc5adba2e2ae6024010d7e4b4bc622df630b484da (diff)
downloadandroid_device_common-06cf41b3aa46fc963d54196a0b3f4c0e09553d31.tar.gz
android_device_common-06cf41b3aa46fc963d54196a0b3f4c0e09553d31.tar.bz2
android_device_common-06cf41b3aa46fc963d54196a0b3f4c0e09553d31.zip
am c5adba2e: (-s ours) Reconcile with jb-dev - do not merge
* commit 'c5adba2e2ae6024010d7e4b4bc622df630b484da':
0 files changed, 0 insertions, 0 deletions