refs/heads/l-preview - platform/tools/adt/idea

commit: 1bdf2a68047fc267fa48023df443d5fb8e0f6a03
[log]
author: Tor Norbye <tnorbye@google.com>
Sat Oct 18 03:49:00 2014 +0000
committer: android-build-merger <android-build-merger@google.com>
Sat Oct 18 03:49:00 2014 +0000
tree: c514afee776d9e1d71884cf1299ad429d66f6ab5
parent: 47b15ffd3eda38c1968d74cc274bfbf8aae108d6 [diff]
parent: 216ddf871fb853ee1c07fb83830de81c8b8217e2 [diff]

Merge "Update welcome screen text (2)" into studio-1.0-dev automerge: 2ca1c1d
automerge: 216ddf8

* commit '216ddf871fb853ee1c07fb83830de81c8b8217e2':
  Update welcome screen text (2)

tree: c514afee776d9e1d71884cf1299ad429d66f6ab5

adt-branding/
android/
android-gradle-jps/
native/
.gitignore
get_aosp_changes.sh
icon-robots.txt