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