summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-01-29 08:21:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-29 08:21:45 -0800
commit77059769ca8f5c20015f521ca8c17e810959183e (patch)
tree886b41e69c0e5da017b1f7a210648aa9c45b5f21
parent36812cec765785f80d23be5495ab499104975e4f (diff)
parent756dafc33b350fc8673f6dfe4a10172299d1a42d (diff)
downloadandroid_device_common-77059769ca8f5c20015f521ca8c17e810959183e.tar.gz
android_device_common-77059769ca8f5c20015f521ca8c17e810959183e.tar.bz2
android_device_common-77059769ca8f5c20015f521ca8c17e810959183e.zip
am 756dafc3: resolved conflicts for merge of b376b2cc to jb-mr1-aah-dev
# Via Jean-Baptiste Queru * commit '756dafc33b350fc8673f6dfe4a10172299d1a42d': Generate blob list for tilapia.
0 files changed, 0 insertions, 0 deletions