OSDN Git Service

am 7c3665e5: am 2b713c2f: (-s ours) am 41df5bfc: Merge "Update javadoc on DPM.setGlob...
authorZoltan Szatmary-Ban <szatmz@google.com>
Thu, 27 Aug 2015 15:14:25 +0000 (15:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 15:14:25 +0000 (15:14 +0000)
commit36b08ea3aae2d02efd4d89641b7688da814625ee
tree7b4365735473ccf7bc6969b1ccc7b87c283dd32b
parentf37c59d44038424a386f8ea1fcc43fbcac5ea94b
parent7c3665e50e4d881c118058c6471f404bad7db199
am 7c3665e5: am 2b713c2f: (-s ours) am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev

* commit '7c3665e50e4d881c118058c6471f404bad7db199':