tree eb81e274f11b6224322071864b419219fec3561b
parent 84edeb53bd2eb7e91cf8c2978f771c6ea79d57d1
parent 926dd56874ce45313da295174e594dfd534137d2
author Jin Qian <jinqian@google.com> 1464373699 +0000
committer android-build-merger <android-build-merger@google.com> 1464373699 +0000

Merge "Upgrade emulator kernels" into nyc-dev
am: 926dd56874

* commit '926dd56874ce45313da295174e594dfd534137d2':
  Upgrade emulator kernels

Change-Id: I58e73fe15496e7ade013f0f48f509f70fc001c10