tree 05ee130c494f87c792f85a4a18124dae1b7c25d1
parent c3b94166cee683d2b095bc9540cbf1176b881757
parent 57c2f0ed82a4c8d9a0bb526177c1ceb525d7a3c4
author Jim Kaye <jameskaye@google.com> 1438389344 +0000
committer android-build-merger <android-build-merger@google.com> 1438389344 +0000

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

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