tree 0ea7591281f45874365ddd40a8a696bc6ee1d964
parent 5071047d7e01186e4d027a2180416ab48415cc36
parent 2b407577256e97f35d1fb25f6ec95415cde8ffdf
author Jing Yu <jingyu@google.com> 1319737660 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1319737660 -0700

Merge "Fix build problems with gcc-4.6.x."