tree 58bd1c77e81b433559dd4b8e38b8b57f32f4cf98
parent 404c4855ab0f85bd5ccccf0d3e443819bad6762a
parent af9272349fb9eed1653d5af0768c9517e36070a6
author Jeff Sharkey <jsharkey@android.com> 1378788170 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378788170 -0700

am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev

* commit 'af9272349fb9eed1653d5af0768c9517e36070a6':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.