tree 893e83ce1019a94d241d652cd851432eb7580f2e
parent e47efca0c45d284f372c5e5618c3b51bf2a07e29
parent cc6d37df1373291d98718f7c93dbb5cd65d4c0bb
author Ian Rogers <irogers@google.com> 1402514776 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402514776 +0000

am cc6d37df: am 4aa9da3f: Merge "Build fix."

* commit 'cc6d37df1373291d98718f7c93dbb5cd65d4c0bb':
  Build fix.