tree 218d2dc358ba7384964d6faf1483eb9d39b1d738
parent dac1d3963e271f7ab4218d0a86545a23faa087dd
parent a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50
author Mark Salyzyn <salyzyn@google.com> 1397241190 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397241190 +0000

am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"

* commit 'a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50':
  build fix for aosp-idea133 @ 1119318