OSDN Git Service

Merge "resolved conflicts for merge of 2f2882a0 to master"
authorJean-Baptiste Queru <jbq@google.com>
Mon, 26 Sep 2011 20:24:33 +0000 (13:24 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 26 Sep 2011 20:24:33 +0000 (13:24 -0700)
commite1891b79455842a794c17c93ce3a4a066076c802
tree501ab37bae2f3525a9bffd1187075690a3d1fdc7
parent57a4eaf4bae1e298d2d0beab69b545aadbc06513
parentbecc3da91507193ef4270d65e2756bb0a00c15a9
Merge "resolved conflicts for merge of 2f2882a0 to master"