tree d432bba0fbeb744fd4f9348d96664bd6097a1c61
parent 38533ea514a452d0fa3aa38557f6e461cb46f402
parent bd1e0076c66084da702a789db90e77c6ca645fe2
author Adam Cohen <adamcohen@google.com> 1348271790 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348271791 -0700

Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev