tree de4b49c7cb620ae04c14f0f5a5d5efef675b2e61
parent 494e600f5cc6598be80e3861730532f608432b41
parent 27c09b05d3ed2a4ce9d53140216aba998727a569
author Adam Cohen <adamcohen@google.com> 1298935500 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1298935500 -0800

Merge "Small update to match API changes"