OSDN Git Service

am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"...
authorDianne Hackborn <hackbod@google.com>
Sat, 23 May 2015 00:44:55 +0000 (00:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 23 May 2015 00:44:55 +0000 (00:44 +0000)
commit54d803c0274137998c7dbb9d7b8af58de13be5b6
tree476c8d87df61fb6d6952540be47d80360b0dec1a
parentc2e945ba37ecb09c640de88abbcc60f5ad76efb8
parentdd5ee4b89083ec9b50b8c9739274136b0c74abb5
am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev

* commit 'dd5ee4b89083ec9b50b8c9739274136b0c74abb5':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"