tree d55bf2e9f4d8ff81668f7f0bbf717db3b9857b90
parent 4cc8c7dd8ebaf38f8f6ad1a9f924f3ea9ad2295d
parent 399bfce299210ef9c2fc1e932202223253e2384a
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.