summaryrefslogtreecommitdiff
path: root/scripts/stack_core.py
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-07-19 00:42:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-19 00:42:03 +0000
commit8b8fca489858f3e519cfbe56007e9d106f1e4982 (patch)
treed184480f7e32e78ca99970d7edfef52e12317410 /scripts/stack_core.py
parent3b929a7a1af76ed2586ee55babdaaafefd152bb6 (diff)
parentdb204c7992edcac02a4a8770bfcb0b906f6543e4 (diff)
am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'db204c7992edcac02a4a8770bfcb0b906f6543e4': Update platform SDK component to revision 5. [DO NOT MERGE]
Diffstat (limited to 'scripts/stack_core.py')
0 files changed, 0 insertions, 0 deletions