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)

Trivial merge