OSDN Git Service

resolved conflicts for merge of 9f312b81 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 25 May 2012 14:16:04 +0000 (07:16 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 25 May 2012 14:16:04 +0000 (07:16 -0700)
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98


Trivial merge