OSDN Git Service

am b164425a: (-s ours) am d76bb175: am 4b69be27: (-s ours) am c816e061: Merge "(DO...
authorNoreen Tolland <noreent@google.com>
Mon, 12 May 2014 23:25:43 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:25:43 +0000 (23:25 +0000)
commiteb2177e035c694fb0f20194581faac33cd3de905
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent48626fb6f6402c7bb4f0f4006f6cd6d47b01d2f3
parentb164425a49dcd5adda308ce5c7212f0ee83f9e7c
am b164425a: (-s ours) am d76bb175: am 4b69be27: (-s ours) am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev

* commit 'b164425a49dcd5adda308ce5c7212f0ee83f9e7c':