tree 2c562a7f390a0ae84f961819c19adc188133cd98
parent 3165abfd3471a83e0544337f0ccbaee92fa57136
parent ff526fa7106fd45bfc4f1606fe051000c5201920
author Jon Larimer <jlarimer@google.com> 1422657690 +0000
committer android-build-merger <android-build-merger@google.com> 1422657690 +0000

am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge: ff526fa

* commit 'ff526fa7106fd45bfc4f1606fe051000c5201920':
  Fix build breakage in older branches by avoiding <> notation