refs/heads/brillo-m7-dev - platform/prebuilts/android-emulator - Git at Google

commit: e7e87a14401fc6504ad36d5fae90a9103b76ec97
[log]
author: Qiwen Zhao <[email protected]>
Thu Oct 01 10:48:08 2015 -0700
committer: Qiwen Zhao <[email protected]>
Thu Oct 01 10:48:08 2015 -0700
tree: 759267e1a8295ea9e0524a4dad23427e825f2feb
parent: 1afae671b7570b24f50331a9eab2afed193fb25f [diff]
parent: 1237f0a72935e344b0aa80e19905a8a200ab5ec9 [diff]

Merge commit '1237f0a729' into stage-aosp-master

tree: 759267e1a8295ea9e0524a4dad23427e825f2feb