summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-06-13 18:07:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-13 18:07:45 -0700
commit800e4320ba0815bfe7831deab99f5d600800663f (patch)
tree2a619fa3c494ff7911f9dcefc96f2beb6df136cd
parent4b724cff027771d0d905809605b5cc50df220a4a (diff)
parent63c34b5e2aae446b76fdf34f0ff895e35cd7376a (diff)
downloaddalvik-800e4320ba0815bfe7831deab99f5d600800663f.tar.gz
am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '63c34b5e2aae446b76fdf34f0ff895e35cd7376a':
0 files changed, 0 insertions, 0 deletions