tree f9286a1f21aad84f1380ba35f6acbe04d4346159
parent 93a911709762e697be1fa0b6e6fef00ae5f36db8
parent e6241f8fc448fc563ed6bf94da09a292e5919339
author Raphael Moll <ralf@android.com> 1399344294 +0000
committer android-build-merger <android-build-merger@google.com> 1399344294 +0000

Merge "Temporarily do not include emulator in sdk build." into idea133
 Auto-merge: e6241f8

* commit 'e6241f8fc448fc563ed6bf94da09a292e5919339':
  Temporarily do not include emulator in sdk build.