OSDN Git Service

Merge "Fix up API definitions in master."
authorDianne Hackborn <hackbod@google.com>
Sun, 5 Dec 2010 22:12:19 +0000 (14:12 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 5 Dec 2010 22:12:19 +0000 (14:12 -0800)
commitcbef6ddfd3f0069693661efbb638c94ad22e21ee
tree0b58f551214399aeabda9e029818d4c4e9d1049d
parentf0e7dcba61e1e41a4710c041c0fdadbeeaba99cb
parent7d41fe4e8c810626d60deb53833916076fdb4d51
Merge "Fix up API definitions in master."