OSDN Git Service

am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations...
authorRobin Lee <rgl@google.com>
Tue, 2 Jun 2015 21:10:18 +0000 (21:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Jun 2015 21:10:18 +0000 (21:10 +0000)
* commit '805402de76dc983b2b785d77531f81ab6eea5f87':
  Device policy: consistent javadoc and annotations


Trivial merge