diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-07-18 23:01:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-18 23:01:07 +0000 |
| commit | 626baa07c8fb1b8b2c038c927c84e4942db8f9b2 (patch) | |
| tree | b4252ddef59b53ff3f7d05e7a43217408f926d1e /scripts/stack_core.py | |
| parent | 2cdeb60c3a98c1ceb8208f641f8df9f988a84f20 (diff) | |
| parent | 1dcb4f05dc21c5aa36d78469f74e39d1cb765b65 (diff) | |
am 1dcb4f05: 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 '1dcb4f05dc21c5aa36d78469f74e39d1cb765b65':
Update platform SDK component to revision 5. [DO NOT MERGE]
Diffstat (limited to 'scripts/stack_core.py')
0 files changed, 0 insertions, 0 deletions