tree 6c42860d90e4c47912e9ba7556ee22a6caf1f069
parent af2abf5adae93b263381ea70d3a0c1a6f03f795f
parent c4a9976aa15929a73ab7c0979d8b2e1e9eeadcc7
author James Dong <jdong@google.com> 1330457006 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330457006 -0800

Merge "Deprecated a mis-spelled method and replaced it with a new method"