OSDN Git Service

am 603fc3af: am 43d52485: add exception to be able to build emulator_tests in conjunc...
authorTsu Chiang Chuang <tsu@google.com>
Mon, 12 May 2014 23:27:21 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:27:21 +0000 (23:27 +0000)
* commit '603fc3af00cb68b439df01db89a92298ab9aa967':


Trivial merge