summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-02-27 06:26:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-27 06:26:28 +0000
commit63c34b5e2aae446b76fdf34f0ff895e35cd7376a (patch)
treeb614ad8f88ff0740115768137f9e2f503d4fb1a5
parentcbac7aed2621a0d51ecddf89af0b3c4a110a17df (diff)
parent68719a176eacf86d19813a38f59041f3b209693d (diff)
downloadandroid_dalvik-63c34b5e2aae446b76fdf34f0ff895e35cd7376a.tar.gz
android_dalvik-63c34b5e2aae446b76fdf34f0ff895e35cd7376a.tar.bz2
android_dalvik-63c34b5e2aae446b76fdf34f0ff895e35cd7376a.zip
am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '68719a176eacf86d19813a38f59041f3b209693d':
0 files changed, 0 insertions, 0 deletions