OSDN Git Service

am 1cd740f1: am 1343ec16: am b75fe469: am eafdd2cd: Fix emulator builds
authorYing Wang <wangying@google.com>
Wed, 4 Jun 2014 22:32:29 +0000 (22:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 22:32:29 +0000 (22:32 +0000)
* commit '1cd740f1f07f3a1293c5034c97d977ba699b105a':
  Fix emulator builds


Trivial merge