tree 92afab43e5362e52f998fce619d77c0e75b81d6a
parent e218d0d3b5feb21e96ccbae62a67dfe5cb3d2ce5
parent b769fc0c576f485022330b40ae5180fb23cc53ee
author Trevor Johns <trevorjohns@google.com> 1417630367 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417630367 +0000

am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs

* commit 'b769fc0c576f485022330b40ae5180fb23cc53ee':
  Docs: Add "admin" to samples categories