tree 459faa22a8d5ddd6e9aefa4a92f01d24b2674e37
parent 63d991f28c1b6f37e19af94dd579bfa7c26a8067
parent de74231f245c90e5861ec84a9880b5b4ec247480
author Jeff Sharkey <jsharkey@android.com> 1410817876 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410817878 +0000

Merge "Update API naming to follow style guide." into lmp-dev