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