summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksiy Vyalov <ovyalov@google.com>2015-08-27 21:56:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:56:16 +0000
commita10246fa206826af075218de70c5beb005fb1b41 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent3d9b384e809614bb4a16d0648f8ca0d1302367e7 (diff)
parentbab1e48da976c49dc7cced4dbb4b5a4379baf983 (diff)
downloadidea-a10246fa206826af075218de70c5beb005fb1b41.tar.gz
am bab1e48d: am 2ccee7c6: (-s ours) am d1c48921: am e658dc09: Merge "Extend run configuration with activity extra flags field." into studio-1.4-dev automerge: c479bf6 automerge: 7abcb97
* commit 'bab1e48da976c49dc7cced4dbb4b5a4379baf983':
0 files changed, 0 insertions, 0 deletions