tree b8cf054554ad7a74dc730c67a0faead55202c1a6
parent f38b98f3b6f91afd62dc7a20a38559c15f8fc80e
parent ec4bc00674168c78a0adbd6f48e8733e16486558
author Rich Slogar <rslogar@google.com> 1415049083 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415049083 +0000

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

* commit 'ec4bc00674168c78a0adbd6f48e8733e16486558':