tree 7d8d98145355348aac0c2ce200047368b7b0c95a
parent 4cd0d582379ca9decba7ee0b99010d9a39f298de
parent a133bc87eb8269a6fa61772cb708f10c9c3b7a87
author Mark Salyzyn <salyzyn@google.com> 1397241000 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397241000 +0000

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

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