tree d1b4a9dcacf29637dbf8db1444681c44d6b6eb8c
parent 957f45c328c9cbe9d1fb65dab6d342dc28a85954
parent e961d0b521bc25caf964258e75fef3d3ea22e4ac
author Joe Fernandez <joefernandez@google.com> 1412284499 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412284499 +0000

am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs

* commit 'e961d0b521bc25caf964258e75fef3d3ea22e4ac':
  Revert "docs: Update for Android 23.0.4"