summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-28 13:50:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 13:50:16 -0700
commit6d07648e94c98400dd54791c643983ca0ce2bc25 (patch)
treebb1cffbd52ddc871395ef8f35b7e0a0c87b9966f
parent1a0a26a27a60b0379ff80b156100bacff4aad42a (diff)
parent8bf2a8aea4a8a6f597bed67b8c6f63d1df5f2a27 (diff)
downloadandroid_device_generic_goldfish-6d07648e94c98400dd54791c643983ca0ce2bc25.tar.gz
android_device_generic_goldfish-6d07648e94c98400dd54791c643983ca0ce2bc25.tar.bz2
android_device_generic_goldfish-6d07648e94c98400dd54791c643983ca0ce2bc25.zip
am 8bf2a8ae: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '8bf2a8aea4a8a6f597bed67b8c6f63d1df5f2a27':
0 files changed, 0 insertions, 0 deletions