OSDN Git Service

resolved conflicts for merge of 972f65f2 to master
authorQiwen Zhao <zhao@google.com>
Mon, 12 Aug 2013 22:30:18 +0000 (15:30 -0700)
committerQiwen Zhao <zhao@google.com>
Mon, 12 Aug 2013 22:30:18 +0000 (15:30 -0700)
commitfb23741ed2c1a99d2555e244584942ff152d1f92
treead0095e6e8aa2184b026d5ff41fca9bce1008e08
parent56752d5d6313890758325f75d0e73a68467da58f
parent972f65f24a63ff280e110ad4ed62730fb4250a73
resolved conflicts for merge of 972f65f2 to master

Change-Id: I497733321c68abc58dbc95309e46497c0514303a