OSDN Git Service

am 4b69be27: (-s ours) am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the...
authorNoreen Tolland <noreent@google.com>
Fri, 31 Jan 2014 23:24:15 +0000 (23:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Jan 2014 23:24:15 +0000 (23:24 +0000)
commitd76bb1755d843f90525a22c191938037cf87a7a1
tree88ce928cc64fc37036aac760d04c9306f159d6fc
parentbc80daffee89269c491680ceb0ba29f84dd0fab0
parent4b69be271c58981eccde155bbfd5ccababc19024
am 4b69be27: (-s ours) am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev

* commit '4b69be271c58981eccde155bbfd5ccababc19024':
  (DO NOT MERGE) Revert "Make libart the default runtime"