tree 7f91b6aae5706ae9cbae9da98b0dda0a40164002
parent 23ac1da7b45114fd5d64a16074eb59e33ce378a7
parent 461cac97962d4353311d14ad092ecbe44d3097b1
author The Android Open Source Project <initial-contribution@android.com> 1376516725 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376516725 -0700

am 461cac97: (-s ours) Reconcile with klp-release - do not merge

* commit '461cac97962d4353311d14ad092ecbe44d3097b1': (172 commits)
  "KRS45B"
  "KRS45"
  "KRS44C"
  "KRS44B"
  "KRS44"
  "KRS43B"
  "KRS43"
  "KRS39E"
  "KRS39D"
  KRS39C
  "KRS39B"
  "KRS39"
  "KRS38B"
  "KRS38"
  "KRS37B"
  "KRS37"
  KRS36B
  "KRS36"
  "KRS31E"
  "KRS31D"
  ...