OSDN Git Service

resolved conflicts for merge of a2ea7405 to mnc-dev-plus-aosp
authorVladimir Marko <vmarko@google.com>
Mon, 1 Jun 2015 14:54:09 +0000 (15:54 +0100)
committerVladimir Marko <vmarko@google.com>
Mon, 1 Jun 2015 14:54:09 +0000 (15:54 +0100)
commit96ba61cb10d237130edc01290fd6c0cb2c670aba
tree6bbc97cc1528b447799591294cb54b5d3831f53c
parentf2445572734da84ee445136901ac61ee8427d489
parenta2ea7405471f6fd7fd5b0d52abb9ad8497c2d144
resolved conflicts for merge of a2ea7405 to mnc-dev-plus-aosp