tree b6b50b1dac9331482f2b890a649a49519ee47427
parent 83e9187d158b891459afc182c675dca56c7dcd93
parent 2a2734f242b0c4447fd30ea594c39e1b977b59ba
author Baligh Uddin <baligh@google.com> 1351725486 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351725493 -0700

Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev