tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent 152e1ac1bb4e87f2935f891e02237ed41f6daa74
parent 9d6d2dc8120485da12ff05715982bf633116a3a8
author Vineeta Srivastava <vsrivastava@google.com> 1414262297 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414262297 +0000

am 9d6d2dc8: (-s ours) mako: update prebuilt kernel [DO NOT MERGE] automerge: cf1be48  -s ours automerge: 1475772  -s ours automerge: a3e49f1  -s ours automerge: a039413  -s ours

* commit '9d6d2dc8120485da12ff05715982bf633116a3a8':
  mako: update prebuilt kernel [DO NOT MERGE]