OSDN Git Service

resolved conflicts for merge of 2f1e3b4d to master
authorMichael Lentine <mlentine@google.com>
Thu, 29 Jan 2015 01:22:35 +0000 (17:22 -0800)
committerMichael Lentine <mlentine@google.com>
Thu, 29 Jan 2015 01:22:35 +0000 (17:22 -0800)
commit9934f29b0d977063bbe368ac23f040a63040056b
treeca12d1c884f0532969d9fb88c12ccce0ae16f48f
parent08741a02e9bc875d9009f2bedf7fa9f25b13cbe6
parent2f1e3b4d219d1ad3fe66cc9abb4ed61be9906ed1
resolved conflicts for merge of 2f1e3b4d to master

Change-Id: I68dcde35fb57593140651df67d60f4cafac441dc