tree c931e8f6c776b13113c0e011c2bbec3efa3a27cf
parent 577c1c0ba2d28a0c3b488b0592f11e827dfde610
parent 29e47d946fd19443c12ebad9f94e83741c7d9120
author Paul Westbrook <pwestbro@google.com> 1355957100 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1355957101 -0800

Merge "Fix some build errors" into jb-ub-mail-ur8