OSDN Git Service

Merge "Squash commits of the following patches, cherry-picked from other branch ...
authorJames Dong <jdong@google.com>
Sat, 15 Jan 2011 00:27:48 +0000 (16:27 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 15 Jan 2011 00:27:48 +0000 (16:27 -0800)
commit83fdc69ea0beb715dd45f0a4285cb5d780f8018a
treea2cf8694c781ff994fa1eb291358a9b9f6232a65
parenta788a9430956dabbc1387e5cccc15f9f41639c95
parent9efe47374b61afd0ce84afa64e9fa5b41dfaef22
Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
api/current.xml