summaryrefslogtreecommitdiff
path: root/scripts/stack_core.py
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-07-18 22:35:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-18 22:35:08 +0000
commit53e1237a8edbad2de948f55b13df596853ae578f (patch)
tree2f939a8cc51d89ce17c9699747f776a3430b8bc1 /scripts/stack_core.py
parent197b278f1cb1b55a15c8e2100faf42313989352c (diff)
parent8ae03adcc1ae490c6ef1ee79bb203201ab4e45a6 (diff)
am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '8ae03adcc1ae490c6ef1ee79bb203201ab4e45a6': Update platform SDK component to revision 5. [DO NOT MERGE]
Diffstat (limited to 'scripts/stack_core.py')
0 files changed, 0 insertions, 0 deletions