tree 1329aac1544113580f657e4b0c7c571e82d492c0
parent 035a2bbd8b8720673e068cf06d646e616a10ab34
parent 7b4c972577179b2dfcf8a59c31b3730d097c5d46
author Jinsuk Kim <jinsukkim@google.com> 1396480643 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396480643 +0000

am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev

* commit '7b4c972577179b2dfcf8a59c31b3730d097c5d46':
  Fix build breakage by updating current.txt