tree ba1c1e5d52488e323bd8295956008e873aa44e14
parent 02018f8babe7be237dc9f80f93edbe32a8de47e3
parent dae80430f9fc492f5751cc390365ae382594b841
author Jim Kaye <jameskaye@google.com> 1438387834 +0000
committer android-build-merger <android-build-merger@google.com> 1438387834 +0000

Merge "Resolving a kernel-panic in windows arm executables." into studio-1.4-dev
automerge: dae8043

* commit 'dae80430f9fc492f5751cc390365ae382594b841':
  Resolving a kernel-panic in windows arm executables.