tree 7a0c418af75edabcf41704558a7a21ec43c78b6f
parent ee870df81593774a76d5618fecbccb8a3299dd2b
parent 4a6b69c54545f5d1b8979eed7b4d734c7c6c21e1
author Rich Slogar <rslogar@google.com> 1415049524 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415049524 +0000

am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b

* commit '4a6b69c54545f5d1b8979eed7b4d734c7c6c21e1':