tree c4d13fa4c87cbf6889ef6e61546dc8927117f14b
parent ad8e78c7033b2f5977f779ff8d85a4a8a690d362
parent 535726f637d952f172e7758e4f0faf725a838add
author Jeff Sharkey <jsharkey@google.com> 1445013198 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445013198 +0000

am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

* commit '535726f637d952f172e7758e4f0faf725a838add':
  Update docs to reflect adoptable behavior.