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)
* commit '4b69be271c58981eccde155bbfd5ccababc19024':
  (DO NOT MERGE) Revert "Make libart the default runtime"


Trivial merge