tree 20d489e1f27cd85bbdda738d0b4bd5ccbb579603
parent 62b7e66e0356810bd11931edf6c14959b70be996
parent d66d3e736fa101b48076433bc305971a19bb8f6f
author Jinsuk Kim <jinsukkim@google.com> 1396489284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396489284 +0000

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

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