tree 6fd80bef3f45b9469e97d26135e07eac6e419c92
parent 0821b9f566cf3b8bee4751b393e24436564a77ea
parent 213f6b1817a6aedae9307443e20ed9afdf399675
author Katie McCormick <kmccormick@google.com> 1383179367 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383179367 -0700

am 213f6b18: am 8d8e5ab7: Merge "Doc change: new Storage Access Framework doc" into klp-dev

* commit '213f6b1817a6aedae9307443e20ed9afdf399675':
  Doc change: new Storage Access Framework doc