OSDN Git Service

Merge "Rename media resource broadcasts Add checks for fwdlocked and updated system...
authorSuchi Amalapurapu <asuchitra@google.com>
Mon, 8 Feb 2010 22:51:38 +0000 (14:51 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 8 Feb 2010 22:51:38 +0000 (14:51 -0800)

Trivial merge