tree d5227a7730033667a96b5c15ffabffc269a6461a
parent 7d2f6d653a8083cf879e7eec3d1aa8ceddbb0107
parent 512bac1a9adb288fb305b17d5d1c234e01e2e517
author Android (Google) Code Review <android-gerrit@google.com> 1247708064 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247708064 -0700

Merge change 7490

* changes:
  Fix master build errors post merge with master_gl branch.