OSDN Git Service

Merge "Several API changes as requested by ES:"
authorDaniel Lehmann <lehmannd@google.com>
Sun, 14 Aug 2011 23:01:59 +0000 (16:01 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 14 Aug 2011 23:01:59 +0000 (16:01 -0700)

Trivial merge