tree c801f70df7f44d095573b28a12c5adbec1933334
parent 3781dcfc26fa7f42956a45f61b8829809066ea2d
parent a83b769566550e30b368836e77b5ac3286844768
author Jing Yu <jingyu@google.com> 1294257385 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294257385 -0800

Merge "Remove global inline options."