summaryrefslogtreecommitdiff
path: root/scripts/stack_core.py
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-07-18 22:57:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-18 22:57:47 +0000
commit1dcb4f05dc21c5aa36d78469f74e39d1cb765b65 (patch)
tree51c9a91ec0847db3b48efd33de9123e0e67df2c7 /scripts/stack_core.py
parenta2c022fa211e62e2f2007ed35b3024b9792af1b3 (diff)
parentae75543ce01ab673951516c8dbf313233a8c946a (diff)
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 'ae75543ce01ab673951516c8dbf313233a8c946a': Update platform SDK component to revision 5. [DO NOT MERGE]
Diffstat (limited to 'scripts/stack_core.py')
0 files changed, 0 insertions, 0 deletions