OSDN Git Service

resolved conflicts for merge of 4706606c to jb-mr2-dev
authorElliott Hughes <enh@google.com>
Thu, 7 Mar 2013 21:19:20 +0000 (13:19 -0800)
committerElliott Hughes <enh@google.com>
Thu, 7 Mar 2013 21:19:20 +0000 (13:19 -0800)
commit8a0157227242eeb7917f064e0d81014bcda6d8f7
tree55f5531730a72309d1f84bf35b324804b342813a
parent0a2ee4750ac4e9e5949dbf97fbad68065e83b632
parent4706606c884cae1bcf73a273580f85bb29255678
resolved conflicts for merge of 4706606c to jb-mr2-dev

Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c