OSDN Git Service

Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev
authorJean-Baptiste Queru <jbq@google.com>
Mon, 20 Aug 2012 22:23:16 +0000 (15:23 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 20 Aug 2012 22:23:16 +0000 (15:23 -0700)
commit8bb154c272dbd11922d74e882a538ea9af6cd7db
treebc5a1968a4c9e8c51b5ff361c0de540a9cf4b826
parentca7a9ef0e52216e88d302feacf8edb766d813f5f
parentacbbd1142db522b15d06d6a1e076463e5c55c8b3
Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev