OSDN Git Service

resolved conflicts for merge of 44053b4e to mnc-dev
authorAndrew Solovay <asolovay@google.com>
Mon, 17 Aug 2015 17:06:26 +0000 (10:06 -0700)
committerAndrew Solovay <asolovay@google.com>
Mon, 17 Aug 2015 17:06:26 +0000 (10:06 -0700)
commitaf46e1b404c1d4fea17a24e5a49f23a7d0c982f7
tree7260f5ce17dff779b02ba3a3d8139815e9fb2322
parented7961eb5a1fceabf30a8f790c8dc37ae714db51
parent44053b4ed3170cde4adde57c6d68537e2fe69d7d
resolved conflicts for merge of 44053b4e to mnc-dev

Change-Id: Ibe58da3f0b18bce138b9d8880bccfe61ebc0b2cf