tree c71cdd4876307510f504b57d06bc73bef5c1a8f5
parent 845755d6e7febc24a6d7a26e68ec2414fe736367
parent 14f717a506a0d22facbec07386b06634e0c6a8ee
author RoboErik <epastern@google.com> 1409946575 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409946576 +0000

Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev