tree 749e64d79cb010bcb4f2c149847bbdeb1c549cb5
parent 93ffc21fc6accb8f9fb4b6069a20006e557cf090
parent 7a91a7434af6542486466b88ad0bc8860fd1c594
author Robert Greenwalt <rgreenwalt@google.com> 1400082991 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400082992 +0000

Merge "Undeprecate funcs until we're ready for api-review"