OSDN Git Service

am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into...
authorRobin Lee <rgl@google.com>
Tue, 2 Jun 2015 18:29:45 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Jun 2015 18:29:45 +0000 (18:29 +0000)
* commit 'f4d9ecc503e7e849ff37a4674680c7213d819592':
  Revert "Consistent documentation and annotations for DPMS"


Trivial merge