OSDN Git Service

Merge "resolved conflicts for merge of fb339016 to master"
authorAdam Powell <adamp@google.com>
Thu, 9 Jun 2011 20:16:50 +0000 (13:16 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 9 Jun 2011 20:16:50 +0000 (13:16 -0700)
commit795a71517873d39c268117696a6b1d785a955aa2
tree713706e3b687bb494c536ef68d1314634302de9f
parenta6d34641a42dc2dfbb8c8642b1a97e9dca97bbb4
parent1529e14fd265b1609dc48a4992c81a1d9b4a3c7a
Merge "resolved conflicts for merge of fb339016 to master"