summaryrefslogtreecommitdiff
path: root/scripts/stack_core.py
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-07-18 23:05:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-18 23:05:10 +0000
commitdb204c7992edcac02a4a8770bfcb0b906f6543e4 (patch)
treee359ff391e21e53cecfe487158d4301b6c140ab5 /scripts/stack_core.py
parent2aad5082c408725de95afc593d4287ea516a9ee6 (diff)
parent626baa07c8fb1b8b2c038c927c84e4942db8f9b2 (diff)
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 '626baa07c8fb1b8b2c038c927c84e4942db8f9b2': Update platform SDK component to revision 5. [DO NOT MERGE]
Diffstat (limited to 'scripts/stack_core.py')
0 files changed, 0 insertions, 0 deletions