tree 0dfe9b14cdcb78aae946aa6fd07fd6627a203c5b
parent a56010682aa45e86ce9e675a88415071397e18e9
parent d46d8577a8cf5ed96c01a70442380910016cdbe2
author Scott Main <smain@google.com> 1323972909 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323972909 -0800

am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0

* commit 'd46d8577a8cf5ed96c01a70442380910016cdbe2':
  Sample app for Android U lesson: Building apps for enterprise - Device administration.