diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-07-18 22:27:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-18 22:27:07 +0000 |
| commit | 5fff297a34f2699a64a055700da4d3411e7c7ca2 (patch) | |
| tree | 66fb18a9897cbbf224e234b3da92aa1fc6c40bc0 /scripts/stack_core.py | |
| parent | 7ee92e43446fe4f9c5f30e997afabe443719bca1 (diff) | |
| parent | e2ee1baff8f1c0275e28ad4ccd5018545933a6e3 (diff) | |
am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'e2ee1baff8f1c0275e28ad4ccd5018545933a6e3':
Update platform SDK component to revision 5. [DO NOT MERGE]
Diffstat (limited to 'scripts/stack_core.py')
0 files changed, 0 insertions, 0 deletions