OSDN Git Service

am 59522cee: (-s ours) resolved conflicts for merge of 27c4e634 to mnc-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Thu, 27 Aug 2015 10:54:37 +0000 (10:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:54:37 +0000 (10:54 +0000)
commit633a137bb20cdb72b1631830e00afc0706659812
tree96a0cefd324d81915ec05e0e285dc2761b61558c
parente7edfd196070e01703b38b00580e85e2d3091b58
parent59522cee564a6a647d8c49dd15f34d6d21d26560
am 59522cee: (-s ours) resolved conflicts for merge of 27c4e634 to mnc-dev-plus-aosp

* commit '59522cee564a6a647d8c49dd15f34d6d21d26560':