tree 10a3ce3f8977e7159435723b27ea392a6d0bfcbf
parent 0646885ddfb5c04cd0c5276e66b51b1a14691c4c
parent a34b1f15292d219b6e2c13fd6f685735c8dd8f8c
author Rich Slogar <rslogar@google.com> 1415046595 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415046595 +0000

am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984

* commit 'a34b1f15292d219b6e2c13fd6f685735c8dd8f8c':