OSDN Git Service

am d8865cc3: Update demo for DPM encryption controls
authorAndy Stadler <stadler@google.com>
Mon, 17 Jan 2011 20:56:21 +0000 (12:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Jan 2011 20:56:21 +0000 (12:56 -0800)
* commit 'd8865cc32c917cebf1fc65c8266d939b9a5718a7':
  Update demo for DPM encryption controls


Trivial merge